diff options
author | Karl Berry <karl@freefriends.org> | 2017-11-12 22:22:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-11-12 22:22:37 +0000 |
commit | 6e968d3c70d693304b8e3669f22c21d2559d2c29 (patch) | |
tree | 5074a87398472d6d2e626c43096604dbcec71939 /Master/texmf-dist/tex/luatex/luatexja/patches | |
parent | 61ef516740ec5cbb3e2cbc5b5c37821a46ac0e11 (diff) |
luatexja (12nov17)
git-svn-id: svn://tug.org/texlive/trunk@45761 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
3 files changed, 15 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index 55c15372392..34ca8d3f613 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjcore}[2017/08/27 Patch to LaTeX2e Kernel for LuaTeX-ja] +\ProvidesPackage{lltjcore}[2017/11/12 Patch to LaTeX2e Kernel for LuaTeX-ja] \RequirePackage{etoolbox} \def\cleardoublepage{\clearpage\if@twoside @@ -183,8 +183,9 @@ \@latex@warning{Reference `#3' on page \thepage \space undefined}% \else - \expandafter#2#1\spacefactor\@m{}% change \null to \spacefactor\@m{} + \expandafter#2#1\protect\@setref@{}% change \null to \protect\@setref@{} \fi} +\gdef\@setref@{\ifhmode\spacefactor\@m\fi} \endgroup \if@compatibility\else \def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 22e0f9d565d..a592e731ea2 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjdefs}[2017/05/05 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2017/11/12 Default font settings of LuaTeX-ja] \def\ltj@stdmcfont{IPAExMincho} \def\ltj@stdgtfont{IPAExGothic} @@ -43,6 +43,13 @@ \DeclareFontShape{JT3}{gt}{bx}{n}{<-> ssub*gt/m/n}{} \KanjiEncodingPair{JY3}{JT3} +\DeclareRelationFont{JY3}{gt}{m}{}{TU}{lmr}{bx}{} +\DeclareRelationFont{JY3}{mc}{m}{}{TU}{lmr}{m}{} +\DeclareRelationFont{JY3}{mc}{bx}{}{TU}{lmr}{bx}{} +\DeclareRelationFont{JT3}{gt}{m}{}{TU}{lmr}{bx}{} +\DeclareRelationFont{JT3}{mc}{m}{}{TU}{lmr}{m}{} +\DeclareRelationFont{JT3}{mc}{bx}{}{TU}{lmr}{bx}{} + \kanjiencoding{JY3}\selectfont\adjustbaseline \DeclareTextFontCommand{\textmc}{\mcfamily} diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty index ec5aecfdd77..2642dd1e4f9 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-unicode-math}[2017/05/05 Patch to unicode-math for LuaTeX-ja] +\ProvidesPackage{lltjp-unicode-math}[2017/11/12 Patch to unicode-math for LuaTeX-ja] \RequirePackage{unicode-math,luatexja} @@ -11,9 +11,9 @@ \group_begin: \bool_new:N \lltjp_um_patch_mathgroup_bool -\@ifpackagelater{unicode-math}{2015/09/24}{% -%%%%%%%% 2015/09/24 0.8c \bool_set_true:N \lltjp_um_patch_mathgroup_bool +%% Recent unicode-math (2017-10-02, v0.8g) does not have \ProvidesPackage, +%% So we can't use the date option of \@ifpackageloaded. \cs_gset:Nn \__um_define_math_chars: { \group_begin: \cs_set:Npn \__um_sym:nnn ##1##2##3 @@ -29,30 +29,11 @@ \__um_input_math_symbol_table: \group_end: } -}{ - \cs_if_exist:cTF { __um_cs_set_eq_active_char:Nw } { - \tl_set:Nn \l_tmpa_tl { __um_cs_set_eq_active_char:Nw } - \bool_set_true:N \lltjp_um_patch_mathgroup_bool - }{ - \tl_set:Nn \l_tmpa_tl { um_cs_set_eq_active_char:Nw } - } - \cs_gset:cpn { \tl_use:N \l_tmpa_tl } #1 = "#2 \q_nil {%" - \group_begin: - %\typeout {um: \string#1, \int_from_hex:n {#2}, #2}% <- for debug - \char_set_lccode:nn { `! } { "#2 }%" - \tex_lowercase:D { - \tl_set:Nn \l_tmpa_tl { \relax - \ifmmode!\else{\directlua{tex.globaldefs = 0}\ltj@allalchar!}\fi} - \cs_gset_eq:NN #1 \l_tmpa_tl - } - \ltjsetmathletter{ \int_from_hex:n {#2} } - \group_end: - } -} \bool_if:NT \lltjp_um_patch_mathgroup_bool { \cs_gset:Npn \use@mathgroup #1 #2 { + %\typeout{UM <#1><#2>} \mode_if_math:T % <- not sure if this is really necessary since we've just checked for mmode and raised an error if not! { \math@bgroup |