diff options
author | Karl Berry <karl@freefriends.org> | 2014-05-05 22:06:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-05-05 22:06:34 +0000 |
commit | c282c4699b5c50d0d050bb1d7f5187a47eebc94e (patch) | |
tree | 247a127065821c008bc8fee600c1e130e2d0ecd5 /Master/texmf-dist/tex/luatex/luatexja/patches | |
parent | c2e26b130cd3c16ddba1e50bd65f8ff334ba8acc (diff) |
luatexja (4may14)
git-svn-id: svn://tug.org/texlive/trunk@33863 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 9d04afe9641..9cd76430e11 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -17,6 +17,7 @@ \newcommand\mcdefault{mc} \newcommand\gtdefault{gt} +\newcommand\jttdefault{\gtdefault} \newcommand\kanjiencodingdefault{JY3} \newcommand\kanjifamilydefault{\mcdefault} \newcommand\kanjiseriesdefault{\mddefault} @@ -30,7 +31,6 @@ \DeclareFontShape{JY3}{mc}{bx}{n}{<-> ssub*gt/m/n}{} \DeclareFontShape{JY3}{gt}{bx}{n}{<-> ssub*gt/m/n}{} -%fontencoding{JT3}\selectfont \kanjiencoding{JY3}\selectfont\adjustbaseline \DeclareTextFontCommand{\textmc}{\mcfamily} diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index 5157a1e9a59..2933844817a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty @@ -611,8 +611,11 @@ %%%% \DeclareAlternateKanjiFont<Benc><Bfam><Bser><Bshape><Aenc><Afam><Aser><Ashape><range> % いつも global \def\DeclareAlternateKanjiFont#1#2#3#4#5#6#7#8#9{% - {\def\ltj@temp@bfont{#1/#2/#3/#4}\def\ltj@temp@afont{#5/#6/#7/#8}% - \expandafter\ltj@@altfont@latex#9,,}\ignorespaces} + \edef\@temp{#9}% + \ifx\@temp\@empty\else + {\def\ltj@temp@bfont{#1/#2/#3/#4}\def\ltj@temp@afont{#5/#6/#7/#8}% + \expandafter\ltj@@altfont@latex#9,,}\ignorespaces + \fi} \def\ltj@@altfont@latex#1,{\def\ltj@temp{#1}% \ifx\ltj@temp\empty\let\@next=\relax\else \ltj@@altfont@latexA{#1}\let\@next=\ltj@@altfont@latex\fi\@next} @@ -638,7 +641,7 @@ \directlua{luatexja.jfont.clear_alt_font_latex('\luatexluaescapestring{#1/#2/#3/#4}')}} \def\ltj@pickup@altfont@aux#1{% - {\edef\font@name{\csname #1/\f@size\endcsname}\pickup@jfont}% + \begingroup\edef\font@name{\csname #1/\f@size\endcsname}\pickup@jfont\endgroup% } \def\ltj@pickup@altfont@copy#1#2{% \ltj@@getjfontnumber#1% |