X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fpatches%2Flltjfont.sty;h=4855f503306369afc4682f95834d80d55f46c5b7;hb=5bf470f139df9dae6f51f0f710ac6b2aeb331e8e;hp=26db755371a3c5cbdf733b3095f4e21bb7cd8b66;hpb=18d63a454075caae8a075d5f341f12e4fbf41770;p=luatex-ja%2Fluatexja.git

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 26db755..4855f50 100644
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
 %
 
 \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
@@ -28,19 +28,29 @@
 \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
@@ -54,7 +64,7 @@
                     {\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
@@ -85,7 +95,7 @@
                     {\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
@@ -142,6 +152,7 @@
               \@empty
             \else \reserved@a
             \fi
+     \directlua{luatexja.jfont.add_ffam('\luatexluaescapestring{#2}')}%
     }%
 }
 \def\DeclareKanjiFamily#1#2#3{%
@@ -154,6 +165,7 @@
               \@empty
             \else \reserved@a
             \fi
+     \directlua{luatexja.jfont.add_kfam('\luatexluaescapestring{#2}')}%
      }%
 }
 \def\DeclareKanjiSubstitution#1#2#3#4{%
@@ -201,13 +213,13 @@
         \usekanji{#2}{#3}{#4}{#5}%
         \global\let#1\getjfont
       \else
-        %\directlua{luatexja.jfont.is_ktenc('\luatexluaescapestring{#2}')}\ifin@%
-        %  \usekanji{#2}{#3}{#4}{#5}%
-        %  \let\font\tfont
-        %\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
   }
@@ -256,8 +268,20 @@
 }
 \newif\if@knjcmd
 \def\userelfont{\@knjcmdtrue}
-\DeclareRobustCommand\selectfont{%
-  \let\tmp@error@fontshape\error@fontshape
+
+
+\RequirePackage{everysel}
+\let\ltj@@EverySelectfont@Init=\@EverySelectfont@Init
+\expandafter\expandafter\expandafter\let
+\expandafter\expandafter\csname ltj@@orig@selectfont\endcsname\csname selectfont\space\endcsname
+\@EverySelectfont@Init
+\def\@EverySelectfont@Init{%
+  \expandafter\let\csname selectfont\space \endcsname \ltj@@orig@selectfont
+  \ltj@@EverySelectfont@Init
+}
+\def\ltj@selectfont@patch{%
+ \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
@@ -270,43 +294,52 @@
       \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha
     \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
   \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
   \pickup@jfont
   \font@name
+  \ltj@@does@alt@set{\curr@kfontshape}%
+    % alt fonts の定義
+    \directlua{luatexja.jfont.output_alt_font_cmd('y', '\luatexluaescapestring{\curr@kfontshape}')}%
+    % 定義した alt fonts のデータを \ltjdeclarealtfont に渡すのと同等の処理をする
+    \directlua{luatexja.jfont.pickup_alt_font_a('\f@size')}%
+  \fi
+%
   \edef\tmp@item{{\k@encoding}}\expandafter\def\expandafter\k@encoding\tmp@item
   \kenc@update
   \let\error@fontshape\tmp@error@fontshape
+%
   \if@knjcmd \@knjcmdfalse
     \expandafter\ifx
     \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax
       \expandafter\ifx
          \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax
       \else
-         \csname rel@\k@encoding/\k@family/\k@series/all\endcsname
+         \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\selectfont
+         % 警告: 再び \selectfont を呼んでいる．無限ループの可能性あり
       \fi
     \else
-       \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname
+       \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\selectfont
+       % 警告: 再び \selectfont を呼んでいる．無限ループの可能性あり
     \fi
   \fi
-  \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}%
-  \pickup@font
-  \font@name
-  \enc@update
-  \ifx\f@linespread\baselinestretch \else
-    \set@fontsize\baselinestretch\f@size\f@baselineskip
-  \fi
-  \size@update
-% ここからは altfont 用
-  \ltj@@does@alt@set{\curr@kfontshape}%
-    % alt fonts の定義
-    \directlua{luatexja.jfont.output_alt_font_cmd('\luatexluaescapestring{\curr@kfontshape}')}%
-    % 定義した alt fonts のデータを \ltjdeclarealtfont に渡すのと同等の処理をする
-    \directlua{luatexja.jfont.pickup_alt_font_a('\f@size')}%
-  \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}%
@@ -319,37 +352,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\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}}
 \newbox\adjust@box
+\newbox\adjust@box@aux
 \newdimen\adjust@dimen
 \def\adjustbaseline{%
-    \setbox\adjust@box\hbox{\ltjsetparameter{yjabaselineshift=\z@}あ}%
+    \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
-  %   \setbox\adjust@box\hbox{\tbaselineshift\z@ M}%
-  %   \adjust@dimen\ht\adjust@box
-  %   \advance\adjust@dimen\dp\adjust@box
-  %   \advance\adjust@dimen-\cHT
-  %   \divide\adjust@dimen\tw@
-  %   \advance\adjust@dimen\cdp
-  %   \advance\adjust@dimen-\dp\adjust@box
-  %   \tbaselineshift\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
@@ -387,11 +423,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
@@ -416,60 +452,39 @@
 \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}}
@@ -521,7 +536,6 @@
 \@onlypreamble\kanjiprocess@table
 \DeclareTextCommandDefault{\textunderscore}{%
   \leavevmode\kern.06em
-  %\iftdir\raise-\tbaselineshift\fi
   \vbox{\hrule\@width.3em}}
 
 %%%%%% LuaTeX-ja specific
@@ -540,6 +554,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 からは異なるフォント番号が振られるように
 % わざと「ゴミをつける」
@@ -551,7 +572,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}
@@ -640,9 +670,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}')}%