X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fpatches%2Flltjfont.sty;h=43ef5593e234e179b65c498ba8e171bb77729cfd;hb=c3bc0f3aa98ff13cb5fa9392eaf58ea71012384a;hp=24bfa8bbd48432eca39a107d1eec541c1d812ee0;hpb=051edef64502865b88719fed3d723344e0cd544c;p=luatex-ja%2Fluatexja.git

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 24bfa8b..43ef559 100644
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -1,9 +1,36 @@
 %
 % lltjfont.sty: derived from plfonts.dtx in pLaTeX.
-% 
+%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2013/05/14 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2019/01/29 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
+}
+\def\ltj@chardef@text@cmd@{%
+  \ifnum\ltj@tempcnta>"7F
+    \expandafter\edef\csname \ltj@chardef@text@cmd@name\endcsname{%
+      \noexpand\ltjalchar\the\ltj@tempcnta\space
+    }%
+  \else
+    \expandafter\chardef\csname \ltj@chardef@text@cmd@name\endcsname\ltj@tempcnta
+  \fi
+}
+\def\DeclareTextSymbol#1#2#3{%
+  \@dec@text@cmd\ltj@chardef@text@cmd#1{#2}#3\relax
+}
+
+\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
+
 
 \let\k@encoding\@empty
 \let\ck@encoding\@empty
@@ -27,28 +54,42 @@
 \ifdefined\chs\else\newdimen\chs\fi
 \ifdefined\cHT\else\newdimen\cHT\fi
 %\let\afont\font
-\def\inlist@#1#2{%
-  \def\in@@##1<#1>##2##3\in@@{%
-    \ifx\in@##2\in@false\else\in@true\fi}%
-  \in@@#2<#1>\in@\in@@}
-\def\fam@elt{\noexpand\fam@elt}
-\def\enc@elt{\noexpand\enc@elt}
-\let\kenc@list\@empty
-\let\kyenc@list\@empty
-\let\ktenc@list\@empty
+
+\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
-  \ifydir
-    \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi
-  \else
+  \ifnum\ltjgetparameter{direction}=1 % dtou
+    \ifmmode\copy\dstrutbox\else\unhcopy\dstrutbox\fi
+  \else\ifnum\ltjgetparameter{direction}=4 % yoko
+    \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi
+  \else % tate and utod
     \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
-  \fi
+  \fi\fi
 }
-\def\tstrut{\relax\hbox{\tate
+
+\def\ystrut{\relax\hbox{\ltj@@orig@yoko
+   \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}}
+\def\tstrut{\relax\hbox{\ltj@@orig@tate
    \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
-\def\zstrut{\relax\hbox{\tate
+\def\dstrut{\relax\hbox{\ltj@@orig@dtou
+   \ifmmode\copy\dstrutbox\else\unhcopy\dstrutbox\fi}}
+\def\zstrut{\relax\hbox{\ltj@@orig@utod
    \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
@@ -62,7 +103,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
@@ -87,16 +128,13 @@
   \expandafter\endgroup
   \DeclareYokoKanjiEncoding@}
 \def\DeclareYokoKanjiEncoding@#1#2#3{%
-  \expandafter
-  \ifx\csname T@#1\endcsname\relax
+  \expandafter\ifx\csname T@#1\endcsname\relax
     \def\cdp@elt{\noexpand\cdp@elt}%
     \xdef\cdp@list{\cdp@list\cdp@elt{#1}%
                     {\default@k@family}{\default@k@series}%
                     {\default@k@shape}}%
     \expandafter\let\csname#1-cmd\endcsname\@changed@kcmd
-    \def\enc@elt{\noexpand\enc@elt}%
-    \xdef\kyenc@list{\kyenc@list\enc@elt<#1>}%
-    \xdef\kenc@list{\kenc@list\enc@elt<#1>}%
+    \directlua{luatexja.jfont.add_kyenc_list('\luatexluaescapestring{#1}')}%
   \else
     \@font@info{Redeclaring KANJI (yoko) font encoding #1}%
   \fi
@@ -109,16 +147,13 @@
   \expandafter\endgroup
   \DeclareTateKanjiEncoding@}
 \def\DeclareTateKanjiEncoding@#1#2#3{%
-  \expandafter
-  \ifx\csname T@#1\endcsname\relax
+  \expandafter\ifx\csname T@#1\endcsname\relax
     \def\cdp@elt{\noexpand\cdp@elt}%
     \xdef\cdp@list{\cdp@list\cdp@elt{#1}%
                     {\default@k@family}{\default@k@series}%
                     {\default@k@shape}}%
     \expandafter\let\csname#1-cmd\endcsname\@changed@kcmd
-    \def\enc@elt{\noexpand\enc@elt}%
-    \xdef\ktenc@list{\ktenc@list\enc@elt<#1>}%
-    \xdef\kenc@list{\kenc@list\enc@elt<#1>}%
+    \directlua{luatexja.jfont.add_ktenc_list('\luatexluaescapestring{#1}')}%
   \else
     \@font@info{Redeclaring KANJI (tate) font encoding #1}%
   \fi
@@ -156,6 +191,7 @@
               \@empty
             \else \reserved@a
             \fi
+     \directlua{luatexja.jfont.add_ffam('\luatexluaescapestring{#2}')}%
     }%
 }
 \def\DeclareKanjiFamily#1#2#3{%
@@ -168,6 +204,7 @@
               \@empty
             \else \reserved@a
             \fi
+     \directlua{luatexja.jfont.add_kfam('\luatexluaescapestring{#2}')}%
      }%
 }
 \def\DeclareKanjiSubstitution#1#2#3#4{%
@@ -206,33 +243,34 @@
    \gdef\f@baselineskip{#5pt}}
 \@onlypreamble\DeclareKanjiSubstitution
 \@onlypreamble\DeclareErrorKanjiFont
+
+\newif\ifltjselectfont@force@define
 \def\DeclareFixedFont#1#2#3#4#5#6{%
    \begingroup
       \math@fontsfalse
       \every@math@size{}%
       \fontsize{#6}\z@
-      \edef\tmp@item{{#2}}%
-      \expandafter\expandafter\expandafter
-      \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}%
-      \ifin@
+      \directlua{luatexja.jfont.is_kyenc('\luatexluaescapestring{#2}')}\ifin@%
+	    \ltjselectfont@force@definetrue
         \usekanji{#2}{#3}{#4}{#5}%
         \global\let#1\getjfont
+	    \ltjselectfont@force@definefalse
       \else
-        %\expandafter\expandafter\expandafter
-        %\inlist@\expandafter\tmp@item\expandafter{\ktenc@list}%
-        %\ifin@
-        %  \usekanji{#2}{#3}{#4}{#5}%
-        %  \let\font\tfont
-        %\else
+        \directlua{luatexja.jfont.is_ktenc('\luatexluaescapestring{#2}')}\ifin@%
+  	      \ltjselectfont@force@definetrue
+          \usekanji{#2}{#3}{#4}{#5}%
+          \global\let#1\gettfont
+	      \ltjselectfont@force@definefalse
+        \else
           \useroman{#2}{#3}{#4}{#5}%
           \global\expandafter\let\expandafter#1\the\font
-        %\fi
+        \fi
       \fi
    \endgroup
   }
 \def\DLMfontsw@standard#1#2#3{#1{#2{#3}}}
 \def\reDeclareMathAlphabet#1#2#3{%
-  \ifdefined#2 
+  \ifdefined#2
     \@temptokena\expandafter{#2}%
   \else
     \@temptokena{#2}%
@@ -275,36 +313,64 @@
 }
 \newif\if@knjcmd
 \def\userelfont{\@knjcmdtrue}
-\DeclareRobustCommand\selectfont{%
+
+
+\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
+%\let\ltj@@font@info\@font@info
+%\let\ltj@@font@warning\@font@warning
+\def\@EverySelectfont@Init{%
+  \expandafter\let\csname selectfont\space \endcsname \ltj@@orig@selectfont
+  \ltj@@EverySelectfont@Init
+}
+\def\ltj@selectfont@tate{%
+  \let\k@encoding\ct@encoding
+  \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
+  \pickup@tfont
+  \ifnum\ltjgetparameter{direction}=3 \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}
+\def\ltj@selectfont@yoko{%
+  \let\k@encoding\cy@encoding
+  \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
+  \pickup@jfont
+  \unless\ifnum\ltjgetparameter{direction}=3 \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}
+\def\ltj@selectfont@patch{%
+  \directlua{luatexja.base.start_time_measure('selectfont')}%
   \let\tmp@error@fontshape\error@fontshape
   \let\error@fontshape\error@kfontshape
-  \edef\tmp@item{{\k@encoding}}%
-  \expandafter\expandafter\expandafter
-  \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}%
-  \ifin@
+  \directlua{luatexja.jfont.is_kyenc('\luatexluaescapestring{\k@encoding}')}\ifin@%
     \let\cy@encoding\k@encoding
     \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}%
   \else
-    \expandafter\expandafter\expandafter
-    \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}%
-    \ifin@
-      \let\ct@encoding\k@encoding
-      \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}%
+    \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
-  %\let\font\tfont
-  %\let\k@encoding\ct@encoding
-  %\xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
-  %\pickup@font
-  %\font@name
-  \let\k@encoding\cy@encoding
-  \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
-  \pickup@jfont
-  \font@name
-  \expandafter\def\expandafter\k@encoding\tmp@item
+  \global\let\ltj@afont@name=\font@name
+  \ltj@selectfont@tate\ltj@selectfont@yoko
+%
+  \edef\tmp@item{{\k@encoding}}\expandafter\def\expandafter\k@encoding\tmp@item
   \kenc@update
+  \global\let\font@name=\ltj@afont@name
   \let\error@fontshape\tmp@error@fontshape
   \if@knjcmd \@knjcmdfalse
     \expandafter\ifx
@@ -312,23 +378,38 @@
       \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
-  %\let\font\afont
-  \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}
+  \global\let\font@name=\ltj@afont@name
+  \directlua{luatexja.base.stop_time_measure('selectfont')}%
+}
+\EverySelectfont{\ltj@selectfont@patch}
+
+\bgroup
+  \def\ltj@@dir@patch#1#2#3{%
+    \global\csletcs{ltj@@orig@#1}{#1}%
+	\protected\expandafter\xdef\csname #1\endcsname{%
+	  \csname ltj@@orig@#1\endcsname
+      \unexpanded{\ifnum#3<\z@\let\ltj@@protect\protect\set@typeset@protect}%
+      \unexpanded{\global\let\ltj@afont@name=\font@name}%
+	  \expandonce{\csname ltj@selectfont@#2\endcsname}%
+      \unexpanded{\global\let\font@name=\ltj@afont@name}%
+      \unexpanded{\let\protect\ltj@@protect\fi}%
+	}%
+  }
+  \ltj@@dir@patch{yoko}{yoko}{\ltj@curjfnt}
+  \ltj@@dir@patch{tate}{tate}{\ltj@curtfnt}
+  \ltj@@dir@patch{utod}{yoko}{\ltj@curjfnt}
+  \ltj@@dir@patch{dtou}{yoko}{\ltj@curjfnt}
+\egroup
+
 \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}%
@@ -341,37 +422,55 @@
       \baselineskip\f@linespread\baselineskip
       \normalbaselineskip\baselineskip
       \adjustbaseline
-      \setbox\strutbox\hbox{%\yoko
+      \setbox\ystrutbox\hbox{\ltj@@orig@yoko
           \vrule\@width\z@
                 \@height.7\baselineskip \@depth.3\baselineskip}%
-      \setbox\tstrutbox\hbox{%\tate
+      \setbox\dstrutbox\hbox{\ltj@@orig@dtou
+          \vrule\@width\z@
+                \@height.7\baselineskip \@depth.3\baselineskip}%
+      \setbox\tstrutbox\hbox{\ltj@@orig@tate
           \vrule\@width\z@
                 \@height.5\baselineskip \@depth.5\baselineskip}%
-      \setbox\zstrutbox\hbox{%\tate
+      \setbox\zstrutbox\hbox{\ltj@@orig@utod
           \vrule\@width\z@
                 \@height.7\baselineskip \@depth.3\baselineskip}%
-        \let\size@update\relax}}
-\newbox\adjust@box
-\newdimen\adjust@dimen
-\def\adjustbaseline{%
-    \setbox\adjust@box\hbox{\ltjsetparameter{yjabaselineshift=\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
-  }
+     \let\size@update\relax}}
+
+\newluafunction\ltj@@adjust@baseline@inner
+\begingroup\catcode`\~=12
+\directlua{%
+  local nulltable = {}
+  local t = lua.get_functions_table()
+  local getfont, dir_tate = font.getfont, luatexja.dir_table.dir_tate
+  local fmt, get_attr = luatexja.jfont.font_metric_table, tex.getattribute
+  local getcount=tex.getcount
+  local setdimen, set_attr = tex.setdimen, tex.setattribute
+  local dir = luatexja.unary_pars.direction
+  t[\the\ltj@@adjust@baseline@inner] = function()
+    local ft = fmt[get_attr('ltj@curtfnt')] or nulltable
+    ft = ft.char_type or nulltable
+    local fk = ft[0] or nulltable
+    local ht, dp, wd = fk.height or 0, fk.depth or 0,
+                       fk.width or ft.zw or 0
+    local fm 
+      = ((getfont(font.current()) or nulltable)
+        .characters or nulltable)[77] or nulltable %% 'M'
+    set_attr('ltj@tablshift',
+      tex.round(0.5*((fm.height or 0)- (fm.depth or 0) - ht+ dp)))
+    if dir() ~= dir_tate then
+      ft = fmt[get_attr('ltj@curjfnt')] or nulltable
+      ft = ft.char_type or nulltable
+      fk = ft[0] or nulltable
+      ht, dp, wd = fk.height or 0, fk.depth or 0,
+                   fk.width or ft.zw or 0
+    end
+    setdimen('cht', ht); setdimen('cdp', dp)
+    setdimen('cwd', wd); setdimen('chs', wd)
+    setdimen('cHT', ht+dp)
+  end
+}\endgroup
+\def\adjustbaseline{\luafunction\ltj@@adjust@baseline@inner
+   \cvs\normalbaselineskip}
 \DeclareRobustCommand\romanencoding[1]{%
     \expandafter\ifx\csname T@#1\endcsname\relax
       \@latex@error{Encoding scheme `#1' unknown}\@eha
@@ -397,24 +496,20 @@
     \fi
 }
 \DeclareRobustCommand\fontencoding[1]{%
-  \edef\tmp@item{{#1}}%
-  \expandafter\expandafter\expandafter
-  \inlist@\expandafter\tmp@item\expandafter{\kenc@list}%
-  \ifin@ \kanjiencoding{#1}\else\romanencoding{#1}\fi}
+  \directlua{luatexja.jfont.is_kyenc('\luatexluaescapestring{#1}')}\ifin@%
+  \kanjiencoding{#1}\else\romanencoding{#1}\fi}
 \def\@@kenc@update{%
   \default@KT
   \csname T@\k@encoding\endcsname
   \csname D@\k@encoding\endcsname
   \let\kenc@update\relax
   \let\ck@encoding\k@encoding
-  \edef\tmp@item{{\k@encoding}}%
-  \expandafter\expandafter\expandafter
-  \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}%
-  \ifin@ \let\cy@encoding\k@encoding
+  \edef\tmp@enc{'\luatexluaescapestring{\k@encoding}'}%
+  \directlua{luatexja.jfont.is_kyenc(\tmp@enc)}\ifin@%
+    \let\cy@encoding\k@encoding
   \else
-    \expandafter\expandafter\expandafter
-    \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}%
-    \ifin@ \let\ct@encoding\k@encoding
+    \directlua{luatexja.jfont.is_ktenc(\tmp@enc)}\ifin@%
+      \let\ct@encoding\k@encoding
     \else
       \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha
     \fi
@@ -442,69 +537,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}}
-% \notkfam@list@<enc>: list of non-defined kanji families under <enc>
-% \kfam@list@<enc>:    list of kanji families under <enc>, defined in a .fd file
 \DeclareRobustCommand\fontfamily[1]{%
-  \@notkfamfalse\@notffamfalse\edef\tmp@item{{#1}}%
-  \ifcsname \k@encoding+#1\endcsname % if \k@encoding+#1 is already defined
-    \edef\k@family{#1}%
-  \else % search font definition file...
-     \ifcsname kfam@list@\k@encoding\endcsname\else
-       \expandafter\gdef\csname kfam@list@\k@encoding\endcsname{}%
-       \expandafter\gdef\csname notkfam@list@\k@encoding\endcsname{}%
-     \fi
-     \edef\@templist{\@nameuse{kfam@list@\k@encoding}}%
-     \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
-     \ifin@\edef\k@family{#1}\else%
-       \edef\@templist{\@nameuse{notkfam@list@\k@encoding}}%
-       \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
-       \ifin@\@notkfamtrue\else%
-         \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\k@encoding+%
-         \message{(I search kanjifont definition file: \@@temp)}%
-         \IfFileExists{\@@temp#1.fd}{\@tempswztrue}{\@tempswzfalse}%
-         \if@tempswz
-           \expandafter\xdef\csname kfam@list@\k@encoding\endcsname
-             {\@nameuse{kfam@list@\k@encoding}\fam@elt<#1>}\edef\k@family{#1}%
-         \else
-           \expandafter\xdef\csname notkfam@list@\k@encoding\endcsname
-             {\@nameuse{notkfam@list@\k@encoding}\fam@elt<#1>}\@notkfamtrue%
-         \fi
-       \fi
-     \fi
-  \fi
-  \ifcsname \f@encoding+#1\endcsname
-    \edef\f@family{#1}%
-  \else % search font definition file...
-     \ifcsname ffam@list@\f@encoding\endcsname\else
-       \expandafter\gdef\csname ffam@list@\f@encoding\endcsname{}%
-       \expandafter\gdef\csname notffam@list@\f@encoding\endcsname{}%
-     \fi
-     \edef\@templist{\@nameuse{ffam@list@\f@encoding}}%
-     \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
-     \ifin@\edef\f@family{#1}\else
-       \edef\@templist{\@nameuse{notffam@list@\f@encoding}}%
-       \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
-       \ifin@\@notffamtrue\else
-         \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\f@encoding+%
-         \message{(I search font definition file: \@@temp)}%
-         \IfFileExists{\@@temp#1.fd}{\@tempswztrue}{\@tempswzfalse}%
-         \if@tempswz
-           \expandafter\xdef\csname ffam@list@\f@encoding\endcsname
-             {\@nameuse{ffam@list@\f@encoding}\fam@elt<#1>}\edef\f@family{#1}%
-         \else
-           \expandafter\xdef\csname notffam@list@\f@encoding\endcsname
-             {\@nameuse{notffam@list@\f@encoding}\fam@elt<#1>}\@notffamtrue%
-         \fi
-       \fi
-     \fi
+  \@notkfamfalse\@notffamfalse
+  \edef\tmp@item{'\luatexluaescapestring{#1}'}%
+  %
+  \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}}
@@ -520,10 +585,8 @@
     \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}%
     \selectfont\ignorespaces}
 \protected\def\usefont#1#2#3#4{%
-  \edef\tmp@item{{#1}}%
-  \expandafter\expandafter\expandafter
-  \inlist@\expandafter\tmp@item\expandafter{\kenc@list}%
-  \ifin@ \usekanji{#1}{#2}{#3}{#4}%
+  \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{#1}')}\ifin@%
+  \usekanji{#1}{#2}{#3}{#4}%
   \else\useroman{#1}{#2}{#3}{#4}%
   \fi}
 \DeclareRobustCommand\normalfont{%
@@ -536,14 +599,13 @@
     \romanseries{\seriesdefault}%
     \romanshape{\shapedefault}%
     \selectfont\ignorespaces}
-\adjustbaseline
 \let\reset@font\normalfont
-\DeclareRobustCommand\mcfamily
-        {\not@math@alphabet\mcfamily\mathmc
-         \kanjifamily\mcdefault\selectfont}
-\DeclareRobustCommand\gtfamily
-        {\not@math@alphabet\gtfamily\mathgt
-         \kanjifamily\gtdefault\selectfont}
+\DeclareRobustCommand\mcfamily{%
+  \unless\ifltj@disablejfam\not@math@alphabet\mcfamily\mathmc\fi
+  \kanjifamily\mcdefault\selectfont}
+\DeclareRobustCommand\gtfamily{%
+  \unless\ifltj@disablejfam\not@math@alphabet\gtfamily\mathgt\fi
+  \kanjifamily\gtdefault\selectfont}
 \let\romanprocess@table\process@table
 \def\kanjiprocess@table{%
   \kanjiencoding{\kanjiencodingdefault}%
@@ -557,38 +619,103 @@
 }
 \@onlypreamble\romanprocess@table
 \@onlypreamble\kanjiprocess@table
-\DeclareTextCommandDefault{\textunderscore}{%
-  \leavevmode\kern.06em
-  %\iftdir\raise-\tbaselineshift\fi
-  \vbox{\hrule\@width.3em}}
 
 %%%%%% LuaTeX-ja specific
 
 % #1 の展開結果から encoding 部分をとりだし，それが和文用かどうかの結果を \ifin@ に代入
 \def\ltj@@IsFontJapanese#1{%
-  \expandafter\ltj@@IsFontJapaneseX#1//:%
-  \expandafter\expandafter\expandafter
-  \inlist@\expandafter\tmp@item\expandafter{\kenc@list}}
-\def\ltj@@IsFontJapaneseX#1/#2/:{\edef\tmp@item{{\directlua{%
-  tex.print(luatexbase.catcodetables["latex-package"], '#1')}%
-}}}
+  \directlua{luatexja.jfont.is_kenc(string.match(
+      '\luatexluaescapestring{#1}', '[^/]+'))}}
 
 
 \let\extract@afont\extract@font
 \def\pickup@jfont{%
+  \ifnum
+	\unless\ifnum\ltjgetparameter{direction}=3 1\else
+	    \ifltjselectfont@force@define 1\else 0\fi\fi =1 %
     \expandafter \ifx \font@name \relax
        \let\extract@font\extract@jfont
        \define@newfont
        \let\extract@font\extract@afont
     \fi
-    \let\getjfont\font@name}
+    \let\getjfont\font@name
+  \else
+	\begingroup\escapechar\m@ne
+	\ifcsname ltj@@fontjfm/\expandafter\string\font@name\endcsname\else
+       \let\extract@font\extract@jfont@onlyjfm
+       \define@newfont
+       \let\extract@font\extract@afont
+	\fi
+	\endgroup
+	\csname ltj@@fontjfm/\expandafter\expandafter\expandafter\@gobble\expandafter\string\font@name\endcsname
+  \fi
+}
+\def\pickup@tfont{%
+  \ifnum
+	\ifnum\ltjgetparameter{direction}=3 1\else
+	    \ifltjselectfont@force@define 1\else 0\fi\fi =1 %
+    \expandafter \ifx \font@name \relax
+       \let\extract@font\extract@tfont
+       \define@newfont
+       \let\extract@font\extract@afont
+    \fi
+    \let\gettfont\font@name
+  \else
+	\begingroup\escapechar\m@ne
+	\ifcsname ltj@@fontjfm/\expandafter\string\font@name\endcsname\else
+       \let\extract@font\extract@tfont@onlyjfm
+       \define@newfont
+       \let\extract@font\extract@afont
+	\fi
+	\endgroup
+	\csname ltj@@fontjfm/\expandafter\expandafter\expandafter\@gobble\expandafter\string\font@name\endcsname
+  \fi
+}
 
+% 異なる和文 enc/fam/ser/shape からは異なるフォント番号が振られるように
+% わざと「ゴミをつける」
+\def\ltj@@patch@external@font#1 at{%
+  \directlua{
+	local s = '\luatexluaescapestring{#1}'
+	local is_braced, is_quoted
+	if s:sub(1,1)=='{' and s:sub(-1)=='}' then is_braced=true; s=s:sub(2,-2) end
+	if s:sub(1,1)=='"' and s:sub(-1)=='"' then is_quoted=true; s=s:sub(2,-2) end
+	s=s..luatexja.jfont.print_aftl_address()
+	if is_braced then s='{'..s..'}' elseif is_quoted then s='"'..s..'"' end
+	%print(s, is_quoted, is_braced)
+    tex.sprint(-2, s)}%
+  \space at%
+}
 \def\extract@jfont{%
-    \get@external@font
-    \expandafter\globaljfont\font@name\external@font\relax
-    \font@name%\global\zw=\zw\global\zh=\zh
+	\get@external@font
+    \ltj@@does@alt@set{\f@encoding/\f@family/\f@series/\f@shape}{%
+      \edef\external@font{\expandafter\ltj@@patch@external@font\romannumeral-`0\external@font}%
+    }%
+    \expandafter\globaljfont\font@name\external@font\relax\font@name% ここで時間がかかる
+    \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}%
+    }%
+    \expandafter\globaltfont\font@name\external@font\relax\font@name
     \csname \f@encoding+\f@family\endcsname
     \csname\curr@fontshape\endcsname}
+\def\extract@jfont@onlyjfm{%
+	\get@external@font
+	\csxdef{ltj@@fontjfm/\expandafter\string\font@name}{%
+	  \directlua{%
+		luatexja.jfont.load_jfmonly('\luatexluaescapestring{\external@font}', 'yoko')
+	  }%
+	}}
+\def\extract@tfont@onlyjfm{%
+	\get@external@font
+	\csxdef{ltj@@fontjfm/\expandafter\string\font@name}{%
+	  \directlua{%
+		luatexja.jfont.load_jfmonly('\luatexluaescapestring{\external@font}', 'tate')
+	  }%
+	}}
 
 \let\ltj@@al@do@subst@correction=\do@subst@correction
 \def\ltj@@ja@do@subst@correction{%
@@ -599,7 +726,7 @@
     \aftergroup\subst@correction
 }
 \def\do@subst@correction{%
-   \ltj@@IsFontJapanese{\curr@fontshape}\ifin@
+   \ltj@@IsFontJapanese{\curr@fontshape}\ifin@%
      \ltj@@ja@do@subst@correction
    \else
      \ltj@@al@do@subst@correction
@@ -608,6 +735,7 @@
 \let\@@italiccorr=\/
 
 %%%%%% Japanese font for math mode
+\unless\ifltj@disablejfam
 
 % \M@<enc> から その <enc> が和文用か調べる
 {\catcode`M=12%
@@ -615,12 +743,15 @@
 
 \let\ltj@@al@getanddefine@fonts=\getanddefine@fonts
 \def\ltj@@ja@getanddefine@fonts#1#2{%
+  \csletcs{if@ltj@tempif}{ifltjselectfont@force@define}
+  \ltjselectfont@force@definetrue
   \xdef\font@name{\csname \string#2/\tf@size\endcsname}%
   \pickup@jfont\let\textfont@name\font@name
   \xdef\font@name{\csname \string#2/\sf@size\endcsname}%
   \pickup@jfont\let\scriptfont@name\font@name
   \xdef\font@name{\csname \string#2/\ssf@size\endcsname}%
   \pickup@jfont
+  \csletcs{ifltjselectfont@force@define}{if@ltj@tempif}
   \edef\math@fonts{\math@fonts\ltj@setpar@global%
     \ltj@@set@stackfont#1,\textfont@name:{MJT}%
     \ltj@@set@stackfont#1,\scriptfont@name:{MJS}%
@@ -641,12 +772,17 @@
     \ifin@\jfam#2\relax\else\mathgroup#2\relax\fi
   \expandafter\math@egroup\fi}%
 
+\fi
+
 %%%%%% Alternate Japanese Fonts
 %%%% \DeclareAlternateKanjiFont<Benc><Bfam><Bser><Bshape><Aenc><Afam><Aser><Ashape><range>
 % いつも global
 \def\DeclareAlternateKanjiFont#1#2#3#4#5#6#7#8#9{%
-  {\def\ltj@temp@bfont{#1/#2/#3/#4}\def\ltj@temp@afont{#5/#6/#7/#8}%
-   \expandafter\ltj@@altfont@latex#9,,}\ignorespaces}
+  \edef\@temp{#9}%
+  \ifx\@temp\@empty\else
+    {\def\ltj@temp@bfont{#1/#2/#3/#4}\def\ltj@temp@afont{#5/#6/#7/#8}%
+     \expandafter\ltj@@altfont@latex#9,,}\ignorespaces
+  \fi}
 \def\ltj@@altfont@latex#1,{\def\ltj@temp{#1}%
   \ifx\ltj@temp\empty\let\@next=\relax\else
   \ltj@@altfont@latexA{#1}\let\@next=\ltj@@altfont@latex\fi\@next}
@@ -661,7 +797,7 @@
     \ifx\ltj@temp\empty\ltj@tempcntb="10FFFF\else\ltj@tempcntb=#2\fi\relax%"
   \fi
   \directlua{luatexja.jfont.set_alt_font_latex(
-    \the\ltj@tempcnta,\the\ltj@tempcntb, 
+    \the\ltj@tempcnta,\the\ltj@tempcntb,
     '\luatexluaescapestring{\ltj@temp@afont}',
     '\luatexluaescapestring{\ltj@temp@bfont}')}%
   }
@@ -669,24 +805,74 @@
 %%%% \ClearAlternateKanjiFont<Benc><Bfam><Bser><Bshape>
 % いつも global
 \def\ClearAlternateKanjiFont#1#2#3#4{%
-   \directlua{luatexja.jfont.clear_alt_font_latex(
-      '\luatexluaescapestring{#1/#2/#3/#4}')}}
-
-% \selectfont 上書き
-\let\ltj@@alt@selectfont@orig=\selectfont
-\def\selectfont{%
-  \ltj@@alt@selectfont@orig
-  % alt fonts の定義
-  \directlua{luatexja.jfont.output_alt_font_cmd('\luatexluaescapestring{\curr@kfontshape}')}%
-  % 定義した alt fonts のデータを \ltjdeclarealtfont に渡すのと同等の処理をする
-  \directlua{luatexja.jfont.pickup_alt_font_a('\f@size')}%
+   \directlua{luatexja.jfont.clear_alt_font_latex('\luatexluaescapestring{#1/#2/#3/#4}')}}
+
+\def\ltj@pickup@altfont@auxy#1{%
+  \begingroup\edef\font@name{\csname #1/\f@size\endcsname}\pickup@jfont\endgroup%
 }
-\def\ltj@pickup@altfont@aux#1{%
-  {\edef\font@name{\csname #1/\f@size\endcsname}\pickup@jfont}%
+\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}')}%
 }
 
+\def\ltj@@does@alt@set#1#2{%
+  \directlua{luatexja.jfont.does_alt_set'\luatexluaescapestring{#1}'}{#2}}
+
+%%%% patch \@text@composite because of {y,t}albaselineshift
+
+% %% \pltx@isletter from plfonts.dtx
+% \def\pltx@mark{\pltx@mark@}
+% \let\pltx@scanstop\relax
+% \long\def\pltx@cond#1\fi{%
+%   #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+% \long\def\pltx@isletter#1{%
+%   \expandafter\pltx@isletter@i#1\pltx@scanstop}
+% \long\def\pltx@isletter@i#1\pltx@scanstop{%
+%   \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}%
+%     {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}}
+% \long\def\pltx@isletter@ii#1\pltx@scanstop#{%
+%   \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi%
+%     {\pltx@isletter@iii}{\pltx@isletter@iv}}
+% \long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo}
+% \long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
+%   \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
+%     \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
+%       {\@firstoftwo}{\@secondoftwo}%
+%   }{\@secondoftwo}}
+%
+% \def\@text@composite@x#1#2{%
+%   \ifx#1\relax
+%     #2%
+%   \else\pltx@isletter{#1}{#1}{%
+%     \begingroup
+%     \setbox\z@\hbox\bgroup%
+%       \ltj@yablshift\z@ \ltj@tablshift\z@
+%       #1%
+%       \@tempcntb\directlua{luatexja.pltx_composite_last_node_char()}%)
+%       \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
+%       \aftergroup\pltx@composite@temp
+%     \egroup
+%     \ifnum\ltjgetparameter{direction}=3 %
+%       \@tempdima=\ltj@tablshift sp\else\@tempdima=\ltj@yablshift sp\fi
+%     \ifnum\@tempcntb<\z@\@tempcnta\z@\else
+%       \@tempcnta=\ltjgetparameter{jacharrange}{\ltjgetparameter{chartorange}{\@tempcntb}}\relax
+%       \ifnum\@tempcnta=\z@\@tempdima\z@\fi
+%     \fi
+%     \ifnum\@tempcnta>\z@
+%       \ifodd\ltjgetparameter{alxspmode}{\@tempcntb}\else\leavevmode\hbox{}\fi
+%       \begingroup\mathsurround\z@$%
+%         \hbox{\lower\@tempdima\box\z@}
+%       $\endgroup%
+%       \ifnum\ltjgetparameter{alxspmode}{\@tempcntb}<2\hbox{}\fi
+%     \else
+%       \ifdim\@tempdima=\z@{\ltj@yablshift\z@ \ltj@tablshift\z@#1}%
+%       \else\lower\@tempdima\box\z@\fi
+%     \fi
+%     \endgroup}%
+%   \fi
+% }
+
 \endinput