From 9426e9b293fe6ebaddfc5b5238a27684ca6040e2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 4 Apr 2016 21:17:01 +0000 Subject: luatexja (4apr16) git-svn-id: svn://tug.org/texlive/trunk@40239 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/luatex/luatexja/ltjsarticle.cls | 4 ++-- Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls | 4 ++-- .../texmf-dist/tex/luatex/luatexja/ltjskiyou.cls | 4 ++-- Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls | 4 ++-- .../tex/luatex/luatexja/patches/lltjcore.sty | 3 ++- .../tex/luatex/luatexja/patches/lltjfont.sty | 28 +++++++++++++++++++++- 6 files changed, 37 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls index 7f73c95a582..e4faea7208f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsarticle} - [2016/03/31 ltjsclasses ] + [2016/04/04 ltjsclasses ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -257,7 +257,7 @@ \dimen@\@tempb\relax \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}% \fi - \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}} + \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}% } \let\ltjs@orig@get@external@font=\get@external@font \def\get@external@font{% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index 70042be7a4d..4a4e18fdc81 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsbook} - [2016/03/31 ltjsclasses ] + [2016/04/04 ltjsclasses ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -264,7 +264,7 @@ \dimen@\@tempb\relax \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}% \fi - \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}} + \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}% } \let\ltjs@orig@get@external@font=\get@external@font \def\get@external@font{% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index 4781e3cd5dc..1dcfd06558c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjskiyou} - [2016/03/31 ltjsclasses ] + [2016/04/04 ltjsclasses ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -258,7 +258,7 @@ \dimen@\@tempb\relax \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}% \fi - \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}} + \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}% } \let\ltjs@orig@get@external@font=\get@external@font \def\get@external@font{% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index 1a153c41978..ac7b765af02 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjspf} - [2016/03/31 ltjsclasses ] + [2016/04/04 ltjsclasses ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -257,7 +257,7 @@ \dimen@\@tempb\relax \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}% \fi - \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}} + \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}% } \let\ltjs@orig@get@external@font=\get@external@font \def\get@external@font{% diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index f8af0aa2d9f..2b301d89ad3 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -4,7 +4,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjcore}[2015/01/01 Patch to LaTeX2e Kernel for LuaTeX-ja] +\ProvidesPackage{lltjcore}[2016/04/01 Patch to LaTeX2e Kernel for LuaTeX-ja] \def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page @@ -79,6 +79,7 @@ \def\@outputtombow{% \iftombow \vbox to\z@{\kern-13mm\relax + \boxmaxdepth\maxdimen \moveleft3mm\vbox to\@@paperheight{% \hbox to\@@paperwidth{\hskip3mm\relax \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip3mm}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index 08f9b7ff027..738e192004f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjfont}[2016/02/07 Patch to NFSS2 for LuaTeX-ja] +\ProvidesPackage{lltjfont}[2016/04/01 Patch to NFSS2 for LuaTeX-ja] \let\k@encoding\@empty \let\ck@encoding\@empty @@ -723,4 +723,30 @@ \def\ltj@@does@alt@set#1{% \directlua{luatexja.jfont.does_alt_set'\luatexluaescapestring{#1}'}} +%%%% patch \@text@composite because of {y,t}albaselineshift +\def\@text@composite#1#2#3#{% + \begingroup + \setbox\z@=\hbox\bgroup% + \ltj@yablshift\z@\ltj@tablshift\z@ + \expandafter\@text@composite@x + \csname\string#1-\string#2\endcsname} +\def\@text@composite@x#1#2{% + \ifx#1\relax + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi + #1{#2}\egroup + \leavevmode + \expandafter\lower + \ifnum\ltjgetparameter{direction}=3 + \ltjgetparameter{talbaselineshift} + \else\ifmmode + \z@ + \else + \ltjgetparameter{yalbaselineshift} + \fi\fi + \box\z@ + \endgroup} + \endinput -- cgit v1.2.3