From 5112bfa157654c21370044635eb59293b8c8d895 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 1 Apr 2017 20:57:19 +0000 Subject: luatexja (1apr17) git-svn-id: svn://tug.org/texlive/trunk@43671 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/luatexja/patches/lltjfont.sty | 32 ++++++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty') diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index 1fdef28c623..f55a93f0d52 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty @@ -3,9 +3,10 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjfont}[2016/04/01 Patch to NFSS2 for LuaTeX-ja] +\ProvidesPackage{lltjfont}[2017/04/01 Patch to NFSS2 for LuaTeX-ja] \def\ltj@chardef@text@cmd#1{% + \let\@ifdefinable\@@ifdefinable% \edef\ltj@chardef@text@cmd@name{\expandafter\@gobble\string#1}% \afterassignment\ltj@chardef@text@cmd@\ltj@tempcnta } @@ -23,7 +24,11 @@ } \ifdefined\UnicodeEncodingName + \let\ltj@temp@DeclareTextComposite=\DeclareTextComposite + \def\DeclareTextComposite#1#2#3#4{}% \input{tuenc.def} + \let\DeclareTextComposite=\ltj@temp@DeclareTextComposite + \expandafter\patchcmd\csname TU\string\textasteriskcentered\endcsname{\char}{\ltjalchar}{}{} \fi @@ -50,21 +55,33 @@ \ifdefined\cHT\else\newdimen\cHT\fi %\let\afont\font +\let\ystrutbox\strutbox \newbox\dstrutbox \newbox\tstrutbox \newbox\zstrutbox +\def\strutbox{% + \ifnum\ltjgetparameter{direction}=1 \dstrutbox % dtou + \else\ifnum\ltjgetparameter{direction}=4 \ystrutbox % yoko + \else\tstrutbox % tate and utod + \fi\fi +} \def\strut{\relax \ifnum\ltjgetparameter{direction}=1 % dtou \ifmmode\copy\dstrutbox\else\unhcopy\dstrutbox\fi \else\ifnum\ltjgetparameter{direction}=4 % yoko - \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi \else % tate and utod \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi \fi\fi } + +\def\ystrut{\relax\hbox{\yoko + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} \def\tstrut{\relax\hbox{\tate \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} -\def\zstrut{\relax\hbox{\tate +\def\dstrut{\relax\hbox{\dtou + \ifmmode\copy\dstrutbox\else\unhcopy\dstrutbox\fi}} +\def\zstrut{\relax\hbox{\utod \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} {% @@ -374,7 +391,7 @@ \baselineskip\f@linespread\baselineskip \normalbaselineskip\baselineskip \adjustbaseline - \setbox\strutbox\hbox{\yoko + \setbox\ystrutbox\hbox{\yoko \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% \setbox\dstrutbox\hbox{\dtou @@ -383,7 +400,7 @@ \setbox\tstrutbox\hbox{\tate \vrule\@width\z@ \@height.5\baselineskip \@depth.5\baselineskip}% - \setbox\zstrutbox\hbox{\tate + \setbox\zstrutbox\hbox{\utod \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% \let\size@update\relax}} @@ -480,7 +497,7 @@ \csname D@\k@encoding\endcsname \let\kenc@update\relax \let\ck@encoding\k@encoding - \edef\tmp@enc{'\luatexluaescapestring{\k@encoding}'} + \edef\tmp@enc{'\luatexluaescapestring{\k@encoding}'}% \directlua{luatexja.jfont.is_kyenc(\tmp@enc)}\ifin@% \let\cy@encoding\k@encoding \else @@ -595,9 +612,6 @@ } \@onlypreamble\romanprocess@table \@onlypreamble\kanjiprocess@table -\DeclareTextCommandDefault{\textunderscore}{% - \leavevmode\kern.06em - \vbox{\hrule\@width.3em}} %%%%%% LuaTeX-ja specific -- cgit v1.2.3