diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty | 124 |
1 files changed, 82 insertions, 42 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index 65d86aceced..e53384d88cf 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}[2014/01/23 Patch to NFSS2 for LuaTeX-ja] +\ProvidesPackage{lltjfont}[2014/10/29 Patch to NFSS2 for LuaTeX-ja] \let\k@encoding\@empty \let\ck@encoding\@empty @@ -28,14 +28,17 @@ \ifdefined\cHT\else\newdimen\cHT\fi %\let\afont\font +\newbox\dstrutbox \newbox\tstrutbox \newbox\zstrutbox \def\strut{\relax - \ifydir + \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 - \else + \else % tate and utod \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi - \fi + \fi\fi } \def\tstrut{\relax\hbox{\tate \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} @@ -201,13 +204,13 @@ \usekanji{#2}{#3}{#4}{#5}% \global\let#1\getjfont \else - %\directlua{luatexja.jfont.is_ktenc('\luatexluaescapestring{#2}')}\ifin@% - % \usekanji{#2}{#3}{#4}{#5}% - % \global\let#1\gettfont - %\else + \directlua{luatexja.jfont.is_ktenc('\luatexluaescapestring{#2}')}\ifin@% + \usekanji{#2}{#3}{#4}{#5}% + \global\let#1\gettfont + \else \useroman{#2}{#3}{#4}{#5}% \global\expandafter\let\expandafter#1\the\font - %\fi + \fi \fi \endgroup } @@ -268,18 +271,30 @@ \ltj@@EverySelectfont@Init } \def\ltj@selectfont@patch{% - \let\tmp@error@fontshape\error@fontshape + \directlua{luatexja.base.start_time_measure('selectfont')}% + \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape \directlua{luatexja.jfont.is_kyenc('\luatexluaescapestring{\k@encoding}')}\ifin@% \let\cy@encoding\k@encoding \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}% \else - %\directlua{luatexja.jfont.is_ktenc('\luatexluaescapestring{\k@encoding}')}\ifin@% - % \let\ct@encoding\k@encoding - % \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}% - %\else + \directlua{luatexja.jfont.is_ktenc('\luatexluaescapestring{\k@encoding}')}\ifin@% + \let\ct@encoding\k@encoding + \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}% + \else \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha - %\fi + \fi + \fi +% + \let\k@encoding\ct@encoding + \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}% + \pickup@tfont + \font@name + \ltj@@does@alt@set{\curr@kfontshape}% + % alt fonts の定義 + \directlua{luatexja.jfont.output_alt_font_cmd('t', '\luatexluaescapestring{\curr@kfontshape}')}% + % 定義した alt fonts のデータを \ltjdeclarealtfont に渡すのと同等の処理をする + \directlua{luatexja.jfont.pickup_alt_font_a('\f@size')}% \fi % \let\k@encoding\cy@encoding @@ -288,7 +303,7 @@ \font@name \ltj@@does@alt@set{\curr@kfontshape}% % alt fonts の定義 - \directlua{luatexja.jfont.output_alt_font_cmd('\luatexluaescapestring{\curr@kfontshape}')}% + \directlua{luatexja.jfont.output_alt_font_cmd('y', '\luatexluaescapestring{\curr@kfontshape}')}% % 定義した alt fonts のデータを \ltjdeclarealtfont に渡すのと同等の処理をする \directlua{luatexja.jfont.pickup_alt_font_a('\f@size')}% \fi @@ -311,11 +326,11 @@ % 警告: 再び \selectfont を呼んでいる.無限ループの可能性あり \fi \fi + \directlua{luatexja.base.stop_time_measure('selectfont')}% } \EverySelectfont{\ltj@selectfont@patch} \def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}} -\KanjiEncodingPair{JY3}{JT3} \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -328,38 +343,40 @@ \baselineskip\f@linespread\baselineskip \normalbaselineskip\baselineskip \adjustbaseline - \setbox\strutbox\hbox{%\yoko + \setbox\strutbox\hbox{\yoko \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% - \setbox\tstrutbox\hbox{%\tate + \setbox\dstrutbox\hbox{\dtou + \vrule\@width\z@ + \@height.7\baselineskip \@depth.3\baselineskip}% + \setbox\tstrutbox\hbox{\tate \vrule\@width\z@ \@height.5\baselineskip \@depth.5\baselineskip}% - \setbox\zstrutbox\hbox{%\tate + \setbox\zstrutbox\hbox{\tate \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% \let\size@update\relax}} \newbox\adjust@box +\newbox\adjust@box@aux \newdimen\adjust@dimen \def\adjustbaseline{% - \setbox\adjust@box\hbox{\ltj@ykblshift=0あ}% + \setbox\adjust@box\hbox{% + \ltj@ykblshift\z@\ltj@tkblshift\z@ 漢}% \cht\ht\adjust@box \cdp\dp\adjust@box \cwd\wd\adjust@box \cvs\normalbaselineskip \chs\cwd \cHT\cht \advance\cHT\cdp - % \iftdir - % \setbox0\hbox{\tate\ltjsetparameter{tjabaselineshift=\z@}あ}% - % \setbox\adjust@box\hbox{\tate\ltjsetparameter{talbaselineshift=\z@}M}% - % \adjust@dimen\ht\adjust@box - % \advance\adjust@dimen\dp\adjust@box - % \advance\adjust@dimen-\ht0 - % \divide\adjust@dimen\tw@ - % \advance\adjust@dimen0.5\dp0 - % \advance\adjust@dimen-\dp\adjust@box - % \ltjsetparameter{talbaselineshift=\adjust@dimen} - % \fi - } + \setbox\adjust@box@aux\hbox{\tate\ltj@tkblshift\z@ 漢}% + \setbox\adjust@box\hbox{\tate\ltj@tablshift\z@ M}% + \adjust@dimen\ht\adjust@box + \advance\adjust@dimen\dp\adjust@box + \advance\adjust@dimen-\ht\adjust@box@aux + \divide\adjust@dimen\tw@ + \advance\adjust@dimen0.5\dp\adjust@box@aux + \advance\adjust@dimen-\dp\adjust@box + \ltj@tablshift=\adjust@dimen} \DeclareRobustCommand\romanencoding[1]{% \expandafter\ifx\csname T@#1\endcsname\relax \@latex@error{Encoding scheme `#1' unknown}\@eha @@ -397,11 +414,11 @@ \directlua{luatexja.jfont.is_kyenc(\tmp@enc)}\ifin@% \let\cy@encoding\k@encoding \else - %\directlua{luatexja.jfont.is_ktenc(\tmp@enc)}\ifin@% - % \let\ct@encoding\k@encoding - %\else + \directlua{luatexja.jfont.is_ktenc(\tmp@enc)}\ifin@% + \let\ct@encoding\k@encoding + \else \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha - %\fi + \fi \fi } \let\kenc@update\relax @@ -426,6 +443,8 @@ \newif\if@notkfam \newif\if@notffam \newif\if@tempswz +\newif\if@ltj@use@fd +\@ltj@use@fdtrue \DeclareRobustCommand\romanfamily[1]{\edef\f@family{#1}} \DeclareRobustCommand\kanjifamily[1]{\edef\k@family{#1}} \DeclareRobustCommand\fontfamily[1]{% @@ -434,7 +453,8 @@ \edef\tmp@enc{'\luatexluaescapestring{\k@encoding}'}% \ifcsname \k@encoding+#1\endcsname % if \k@encoding+#1 is already defined \edef\k@family{#1}% - \else % search font definition file... + \else\if@ltj@use@fd + % search font definition file... \directlua{luatexja.jfont.is_kfam(\tmp@enc, \tmp@item)}% \ifin@\edef\k@family{#1}\else% \directlua{luatexja.jfont.is_Nkfam(\tmp@enc, \tmp@item)}% @@ -452,7 +472,9 @@ \fi \fi \fi - \fi + \else % do not use font definition file + \@notkfamtrue% + \fi\fi \edef\tmp@enc{'\luatexluaescapestring{\f@encoding}'}% \ifcsname \f@encoding+#1\endcsname \edef\f@family{#1}% @@ -531,7 +553,6 @@ \@onlypreamble\kanjiprocess@table \DeclareTextCommandDefault{\textunderscore}{% \leavevmode\kern.06em - %\iftdir\raise-\tbaselineshift\fi \vbox{\hrule\@width.3em}} %%%%%% LuaTeX-ja specific @@ -550,6 +571,13 @@ \let\extract@font\extract@afont \fi \let\getjfont\font@name} +\def\pickup@tfont{% + \expandafter \ifx \font@name \relax + \let\extract@font\extract@tfont + \define@newfont + \let\extract@font\extract@afont + \fi + \let\gettfont\font@name} % 異なる和文 enc/fam/ser/shape からは異なるフォント番号が振られるように % わざと「ゴミをつける」 @@ -561,7 +589,16 @@ \ltj@@does@alt@set{\f@encoding/\f@family/\f@series/\f@shape}% \edef\external@font{\expandafter\ltj@@patch@external@font\external@font}% \fi - \expandafter\globaljfont\font@name\external@font\relax + \expandafter\globaljfont\font@name\external@font\relax% ここで時間がかかる + \font@name%\global\zw=\zw\global\zh=\zh + \csname \f@encoding+\f@family\endcsname + \csname\curr@fontshape\endcsname} +\def\extract@tfont{% + \get@external@font + \ltj@@does@alt@set{\f@encoding/\f@family/\f@series/\f@shape}% + \edef\external@font{\expandafter\ltj@@patch@external@font\external@font}% + \fi + \expandafter\globaltfont\font@name\external@font\relax \font@name%\global\zw=\zw\global\zh=\zh \csname \f@encoding+\f@family\endcsname \csname\curr@fontshape\endcsname} @@ -650,9 +687,12 @@ \def\ClearAlternateKanjiFont#1#2#3#4{% \directlua{luatexja.jfont.clear_alt_font_latex('\luatexluaescapestring{#1/#2/#3/#4}')}} -\def\ltj@pickup@altfont@aux#1{% +\def\ltj@pickup@altfont@auxy#1{% \begingroup\edef\font@name{\csname #1/\f@size\endcsname}\pickup@jfont\endgroup% } +\def\ltj@pickup@altfont@auxt#1{% + \begingroup\edef\font@name{\csname #1/\f@size\endcsname}\pickup@tfont\endgroup% +} \def\ltj@pickup@altfont@copy#1#2{% \ltj@@getjfontnumber#1% \directlua{luatexja.jfont.pickup_alt_font_b(\the\ltj@tempcntc,'\luatexluaescapestring{#2}')}% |