\ltj@@adjust@baseline@inner: more robust

[luatex-ja/luatexja.git] / src / patches / lltjfont.sty

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index fa6b362..1bfcfa2 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2015/08/27 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
@@ -365,6 +365,36 @@
           \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
@@ -377,15 +407,8 @@
     \cvs\normalbaselineskip
     \chs\cwd
     \cHT\cht \advance\cHT\cdp
-    \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}
+    \ltj@@adjust@baseline
+}
 \DeclareRobustCommand\romanencoding[1]{%
     \expandafter\ifx\csname T@#1\endcsname\relax
       \@latex@error{Encoding scheme `#1' unknown}\@eha
@@ -484,10 +507,7 @@
   \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}}