diff options
author | Karl Berry <karl@freefriends.org> | 2013-05-15 21:51:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-05-15 21:51:27 +0000 |
commit | c293cc5e64a5575b0b22a373061569bacf92ee76 (patch) | |
tree | d0431b0c920cde04479ecc42fcb2fec28b394a8f /Master/texmf-dist/tex/luatex/luatexja/addons | |
parent | 7125751ebd8f93429724b73226f3350a0e0e7635 (diff) |
luatexja (15may13)
git-svn-id: svn://tug.org/texlive/trunk@30485 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons')
5 files changed, 88 insertions, 15 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 21404ec1456..a9262106618 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty @@ -64,13 +64,13 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-adjust}[2012/10/01 v0.1] + \ProvidesPackage{luatexja-adjust}[2013/05/14] \fi %</LaTeX> % Load core module if not yet. \ifx\luatexjacoreLoaded\@undefined \ifltj@in@latex %<*LaTeX> - \RequirePackage{luatexja}[2012/04/20] + \RequirePackage{luatexja}[2013/05/14] \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 a4aa8339acc..3944b966828 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}[2012/05/08 v0.1a] + \ProvidesPackage{luatexja-ajmacros}[2013/05/14] \fi %</LaTeX> %%------------------ 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 056ae0cc6f9..13a2520b15e 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}[2012/09/17 v0.2a] +\ProvidesPackage{luatexja-fontspec}[2013/05/14 fontspec support of LuaTeX-ja] \RequirePackage{fontspec,luatexja} \ExplSyntaxOn @@ -103,11 +103,14 @@ \DeclareDocumentCommand \setmainjfont { O{} m } { \ltj_fontspec_set_family:Nnn \mcdefault {#1}{#2} + \DeclareSymbolFont{mincho}{JY3}{\l_fontspec_family_tl}{m}{n} + \SetSymbolFont{mincho}{bold}{JY3}{\l_fontspec_family_tl}{bx}{n} \normalfont } \DeclareDocumentCommand \setsansjfont { O{} m } { \ltj_fontspec_set_family:Nnn \gtdefault {#1}{#2} + \DeclareMathAlphabet{\mathgt}{JY3}{\l_fontspec_family_tl}{m}{n} \normalfont } 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 290f6b17aa0..c2e42fbbef6 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}[2012/04/20 v0.2] + \ProvidesPackage{luatexja-otf}[2013/05/14] \fi %</LaTeX> % Load core module if not yet. \ifx\luatexjacoreLoaded\@undefined \ifltj@in@latex %<*LaTeX> - \RequirePackage{luatexja}[2012/04/20] + \RequirePackage{luatexja}[2013/05/14] \else %<*!LaTeX> \input luatexja.sty % \fi %</LaTeX> @@ -94,7 +94,7 @@ %% Load ajmacros \ifltj@in@latex %<*LaTeX> - \RequirePackage{luatexja-ajmacros}[2011/09/19] + \RequirePackage{luatexja-ajmacros}[2013/05/14] \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 61983d57cbf..ad0a21b886f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty @@ -1,6 +1,6 @@ % luatexja-preset.sty -\ProvidesPackage{luatexja-preset} - [2012/09/17 v0.1] +\ProvidesPackage{luatexja-preset}[2013/05/14 Japanese font presets] +%% Sync with PXchfon 0.6a \RequirePackage{expl3} \RequirePackage{luatexja-fontspec} @@ -8,7 +8,6 @@ %%%% message - \bool_new:N \l_ltjpreset_bold_bool % bold \bool_set_false:N \l_ltjpreset_bold_bool \DeclareOption{bold} {\bool_set_true:N \l_ltjpreset_bold_bool} @@ -21,12 +20,12 @@ \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 }} % 7 fonts \DeclareOption{nodeluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 0 }} % 2 fonts % scale \msg_new:nnn { luatexja-preset }{ scale }{ - 日本語フォントは~\fp_use:N \g_ltj_fontspec_scale_fp~倍にスケーリングされます. + Japanese~fonts~will~be~scaled~by~\fp_use:N \g_ltj_fontspec_scale_fp. } \msg_warning:nn { luatexja-preset }{ scale } @@ -65,6 +64,8 @@ \bool_set_true:N \l_ltjpreset_office_bool } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% OBSOLETE % kozuka \DeclareOption{kozuka4}{ \ltjpreset_set_multi:n { @@ -127,6 +128,75 @@ } } +\DeclareOption{ipaex-dx}{\ltjpreset_set_office:nn { IPAExMincho } { IPAExGothic }} +\DeclareOption{ipa-dx} {\ltjpreset_set_office:nn { IPAMincho } { IPAGothic }} +\DeclareOption{ms-dx} {\ltjpreset_set_office:nn { MS-Mincho } { MS-Gothic }} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + +% kozuka +\DeclareOption{kozuka-pro}{ + \ltjpreset_set_multi:n { + KozMinPro-Regular.otf , KozMinPro-Bold.otf, % mc/m, mc/bx + KozGoPro-Regular.otf , KozGoPro-Bold.otf, % gt/m, gt/bx (multiweight)) + KozGoPro-Medium.otf , KozGoPro-Heavy.otf, % gt/m (uni), gt/eb + KozGoPro-Heavy.otf % mg/m + } +} +\DeclareOption{kozuka-pr6}{ + \ltjpreset_set_multi:n { + KozMinProVI-Regular.otf , KozMinProVI-Bold.otf, % mc/m, mc/bx + KozGoProVI-Regular.otf , KozGoProVI-Bold.otf, % gt/m, gt/bx (multiweight)) + KozGoProVI-Medium.otf , KozGoProVI-Heavy.otf, % gt/m (uni), gt/eb + KozGoProVI-Heavy.otf % mg/m + } +} +\DeclareOption{kozuka-pr6n}{ + \ltjpreset_set_multi:n { + KozMinPr6N-Regular.otf , KozMinPr6N-Bold.otf, % mc/m, mc/bx + KozGoPr6N-Regular.otf , KozGoPr6N-Bold.otf, % gt/m, gt/bx (multiweight)) + KozGoPr6N-Medium.otf , KozGoPr6N-Heavy.otf, % gt/m (uni), gt/eb + KozGoPr6N-Heavy.otf % mg/m + } +} + +% hiragino +\DeclareOption{hiragino-pro}{ + \ltjpreset_set_multi:n { + HiraMinPro-W3.otf , HiraMinPro-W6.otf, % mc/m, mc/bx + HiraKakuPro-W3.otf , HiraKakuPro-W6.otf, % gt/m, gt/bx (multiweight)) + HiraKakuPro-W6.otf , HiraKakuStd-W8.otf, % gt/m (uni), gt/eb + HiraMaruPro-W4.otf % mg/m + } +} +\DeclareOption{hiragino-pron}{ + \ltjpreset_set_multi:n { + HiraMinProN-W3.otf , HiraMinProN-W6.otf, % mc/m, mc/bx + HiraKakuProN-W3.otf , HiraKakuProN-W6.otf, % gt/m, gt/bx (multiweight)) + HiraKakuProN-W6.otf , HiraKakuStdN-W8.otf, % gt/m (uni), gt/eb + HiraMaruProN-W4.otf % mg/m + } +} + +% morisawa +\DeclareOption{morisawa-pro}{ + \ltjpreset_set_multi:n { + A-OTF-RyuminPro-Light.otf , A-OTF-FutoMinA101Pro-Bold.otf , % mc/m, mc/bx + A-OTF-GothicBBBPro-Medium.otf , A-OTF-FutoGoB101Pro-Bold.otf , % gt/m, gt/bx (multiweight)) + A-OTF-GothicBBBPro-Medium.otf , A-OTF-MidashiGoPro-MB31.otf , % gt/m (uni), gt/eb + A-OTF-Jun101Pro-Light.otf % mg/m + } +} +\DeclareOption{morisawa-pr6n}{ + \ltjpreset_set_multi:n { + A-OTF-RyuminPr6N-Light.otf , A-OTF-FutoMinA101Pr6N-Bold.otf , % mc/m, mc/bx + A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-FutoGoB101Pr6N-Bold.otf , % gt/m, gt/bx (multiweight)) + A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-MidashiGoPr6N-MB31.otf , % gt/m (uni), gt/eb + A-OTF-Jun101Pr6N-Light.otf % mg/m + } +} + % ipa, ipaex, ms \DeclareOption{ipa}{ @@ -140,13 +210,13 @@ } % {ipa,ipaex,ms}-dx % Office 付属フォントを利用 -\DeclareOption{ipaex-dx}{ +\DeclareOption{ipaex-hg}{ \ltjpreset_set_office:nn { IPAExMincho } { IPAExGothic } } -\DeclareOption{ipa-dx}{ +\DeclareOption{ipa-hg}{ \ltjpreset_set_office:nn { IPAMincho } { IPAGothic } } -\DeclareOption{ms-dx}{ +\DeclareOption{ms-hg}{ \ltjpreset_set_office:nn { MS-Mincho } { MS-Gothic } } |