%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2014/01/23 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2015/08/28 Patch to NFSS2 for LuaTeX-ja]
\let\k@encoding\@empty
\let\ck@encoding\@empty
\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}}
\def\zstrut{\relax\hbox{\tate
\ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}}
+
+{%
+ \def\cdp@elt#1#2#3#4{%
+ \directlua{luatexja.jfont.add_fenc_list('\luatexluaescapestring{#1}')}}%
+ \cdp@list%
+}
+
\def\DeclareFontEncoding{%
\begingroup
\nfss@catcodes
{\default@family}{\default@series}%
{\default@shape}}%
\expandafter\let\csname#1-cmd\endcsname\@changed@cmd
- \def\enc@elt{\noexpand\enc@elt}%
+ \directlua{luatexja.jfont.add_fenc_list('\luatexluaescapestring{#1}')}%
\else
\@font@info{Redeclaring font encoding #1}%
\fi
{\default@k@family}{\default@k@series}%
{\default@k@shape}}%
\expandafter\let\csname#1-cmd\endcsname\@changed@kcmd
- \directlua{luatexja.jfont.add_kyenc_list('\luatexluaescapestring{#1}')}%
+ \directlua{luatexja.jfont.add_kyenc_list('\luatexluaescapestring{#1}')}%
\else
\@font@info{Redeclaring KANJI (yoko) font encoding #1}%
\fi
\@empty
\else \reserved@a
\fi
+ \directlua{luatexja.jfont.add_ffam('\luatexluaescapestring{#2}')}%
}%
}
\def\DeclareKanjiFamily#1#2#3{%
\@empty
\else \reserved@a
\fi
+ \directlua{luatexja.jfont.add_kfam('\luatexluaescapestring{#2}')}%
}%
}
\def\DeclareKanjiSubstitution#1#2#3#4{%
\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
}
\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
\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
% 警告: 再び \selectfont を呼んでいる．無限ループの可能性あり
\fi
\fi
+ \directlua{luatexja.base.stop_time_measure('selectfont')}%
}
\EverySelectfont{\ltj@selectfont@patch}
-\def\@EverySelectfont@Init{\let\@EverySelectfont@Init\undefined}
\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}%
\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\dstrutbox\hbox{\dtou
\vrule\@width\z@
\@height.7\baselineskip \@depth.3\baselineskip}%
- \setbox\tstrutbox\hbox{%\tate
+ \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}}
+
+\ifdefined\newluafunction
+ \newluafunction\ltj@@adjust@baseline@inner
+ \directlua{%
+ local t = lua.get_functions_table()
+ t[\the\ltj@@adjust@baseline@inner] = function()
+ local ft = luatexja.jfont.font_metric_table[
+ tex.getattribute('ltj@curtfnt')] or {}
+ ft = ft and ft.char_type or {}
+ ft = ft and ft[0] or {}
+ local fm = font.getfont(font.current()).characters[77] or {} %% 'M'
+ tex.setattribute('ltj@tablshift',
+ 0.5*((fm.height or 0)- (fm.depth or 0)
+ - (ft.height or 0)+ (ft.depth or 0)))
+ end
+ }
+ \def\ltj@@adjust@baseline{\luafunction\ltj@@adjust@baseline@inner}
+\else
+ \def\ltj@@adjust@baseline{%
+ \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
+ }
+\fi
\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
- }
+ \ltj@@adjust@baseline
+}
\DeclareRobustCommand\romanencoding[1]{%
\expandafter\ifx\csname T@#1\endcsname\relax
\@latex@error{Encoding scheme `#1' unknown}\@eha
\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
\newif\if@notkfam
\newif\if@notffam
\newif\if@tempswz
+\def\@ltj@use@fd{true}
\DeclareRobustCommand\romanfamily[1]{\edef\f@family{#1}}
\DeclareRobustCommand\kanjifamily[1]{\edef\k@family{#1}}
\DeclareRobustCommand\fontfamily[1]{%
\@notkfamfalse\@notffamfalse
\edef\tmp@item{'\luatexluaescapestring{#1}'}%
- \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...
- \directlua{luatexja.jfont.is_kfam(\tmp@enc, \tmp@item)}%
- \ifin@\edef\k@family{#1}\else%
- \directlua{luatexja.jfont.is_Nkfam(\tmp@enc, \tmp@item)}%
- \ifin@\@notkfamtrue\else%
- % filename of font definition file is always lowercase
- \edef\@temp{\lowercase{\noexpand\IfFileExists{\k@encoding#1.fd}}}%
- \message{(I search kanjifont definition file)}%
- \@temp{\@tempswztrue}{\@tempswzfalse}%
- \if@tempswz
- \directlua{luatexja.jfont.add_kfam_list(\tmp@enc, \tmp@item)}%
- \edef\k@family{#1}%
- \else
- \directlua{luatexja.jfont.add_Nkfam_list(\tmp@enc, \tmp@item)}%
- \@notkfamtrue%
- \fi
- \fi
- \fi
- \fi
- \edef\tmp@enc{'\luatexluaescapestring{\f@encoding}'}%
- \ifcsname \f@encoding+#1\endcsname
- \edef\f@family{#1}%
- \else % search font definition file...
- \directlua{luatexja.jfont.is_ffam(\tmp@enc, \tmp@item)}%
- \ifin@\edef\f@family{#1}\else
- \directlua{luatexja.jfont.is_Nffam(\tmp@enc, \tmp@item)}%
- \ifin@\@notffamtrue\else
- % filename of font definition file is always lowercase
- \edef\@temp{\lowercase{\noexpand\IfFileExists{\f@encoding#1.fd}}}%
- \message{(I search font definition file)}%
- \@temp{\@tempswztrue}{\@tempswzfalse}%
- \if@tempswz
- \directlua{luatexja.jfont.add_ffam_list(\tmp@enc, \tmp@item)}%
- \edef\f@family{#1}%
- \else
- \directlua{luatexja.jfont.add_Nffam_list(\tmp@enc, \tmp@item)}%
- \@notffamtrue%
- \fi
- \fi
- \fi
+ %
+ \directlua{luatexja.jfont.search_kfam(\tmp@item, \@ltj@use@fd)}%
+ \ifin@\edef\k@family{#1}\else\@notkfamtrue\fi
+ %
+ % alphabetic fonts part
+ \directlua{luatexja.jfont.is_ffam(\tmp@item)}%
+ \ifin@\edef\f@family{#1}\else
+ % checking is_stored_ffam is not sufficient,
+ % since LuaTeX-ja doesn't know whats fonts are defined before LuaTeX-ja is loaded.
+ \ifcsname \f@encoding+#1\endcsname % easy case
+ \directlua{luatexja.jfont.add_ffam(\tmp@item)}\edef\f@family{#1}%
+ \else
+ \@tempswafalse
+ \def\cdp@elt##1{\ifcsname ##1+#1\endcsname\@tempswatrue\fi}%
+ \directlua{luatexja.jfont.search_ffam_declared()}%
+ \if@tempswz
+ \directlua{luatexja.jfont.add_ffam(\tmp@item)}\edef\f@family{#1}%
+ \else
+ % now we search Nffam_list and font definition files.
+ \directlua{luatexja.jfont.search_ffam_fd(\tmp@item)}%
+ \ifin@\edef\f@family{#1}\else\@notffamtrue\fi
+ \fi
+ \fi
\fi
+ %
\if@notkfam\if@notffam
- {\ifcsname D@\k@encoding\endcsname\@nameuse{D@\k@encoding}\fi
- \xdef\@@temp{\default@family}}\edef\k@family{\@@temp}%
- {\ifcsname D@\f@encoding\endcsname\@nameuse{D@\f@encoding}\fi
- \xdef\@@temp{\default@family}}\edef\f@family{\@@temp}%
+ \edef\k@family{#1}\edef\f@family{#1}%
\fi\fi
}
\DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}}
\@onlypreamble\kanjiprocess@table
\DeclareTextCommandDefault{\textunderscore}{%
\leavevmode\kern.06em
- %\iftdir\raise-\tbaselineshift\fi
\vbox{\hrule\@width.3em}}
%%%%%% LuaTeX-ja specific
\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 からは異なるフォント番号が振られるように
% わざと「ゴミをつける」
\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}
\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}')}%
OSDN Git Service
