X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fpatches%2Flltjfont.sty;h=738e192004f4fb0df8e13da653c5a777d58e80d4;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=1bfcfa24bad6c2c83c62a611f83c4ce144108b1a;hpb=2018c421a9ddac89c6eee4711c616363097b0b2d;p=luatex-ja%2Fluatexja.git

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 1bfcfa2..738e192 100644
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2015/08/28 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2016/04/01 Patch to NFSS2 for LuaTeX-ja]
 
 \let\k@encoding\@empty
 \let\ck@encoding\@empty
@@ -368,22 +368,52 @@
 
 \ifdefined\newluafunction
   \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 setdimen, set_attr = tex.setdimen, tex.setattribute
+    local dir = luatexja.unary_pars.direction
     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)))
+      local ft = fmt[get_attr('ltj@curtfnt')] or nulltable
+      ft = ft and ft.char_type or nulltable
+      local fk = ft and 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',
+        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 and ft.char_type or nulltable
+        fk = ft and 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
-  }
-  \def\ltj@@adjust@baseline{\luafunction\ltj@@adjust@baseline@inner}
+  }\endgroup
+  \def\adjustbaseline{\luafunction\ltj@@adjust@baseline@inner
+     \cvs\normalbaselineskip}
 \else
-  \def\ltj@@adjust@baseline{%
+  \newbox\adjust@box
+  \newbox\adjust@box@aux
+  \newdimen\adjust@dimen
+  \def\adjustbaseline{%
+    \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
     \setbox\adjust@box@aux\hbox{\tate\ltj@tkblshift\z@ æ¼¢}%
     \setbox\adjust@box\hbox{\tate\ltj@tablshift\z@ M}%
     \adjust@dimen\ht\adjust@box
@@ -395,20 +425,6 @@
     \ltj@tablshift=\adjust@dimen
   }
 \fi
-\newbox\adjust@box
-\newbox\adjust@box@aux
-\newdimen\adjust@dimen
-\def\adjustbaseline{%
-    \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
-    \ltj@@adjust@baseline
-}
 \DeclareRobustCommand\romanencoding[1]{%
     \expandafter\ifx\csname T@#1\endcsname\relax
       \@latex@error{Encoding scheme `#1' unknown}\@eha
@@ -707,4 +723,30 @@
 \def\ltj@@does@alt@set#1{%
   \directlua{luatexja.jfont.does_alt_set'\luatexluaescapestring{#1}'}}
 
+%%%% patch \@text@composite because of {y,t}albaselineshift
+\def\@text@composite#1#2#3#{%
+  \begingroup
+  \setbox\z@=\hbox\bgroup%
+  \ltj@yablshift\z@\ltj@tablshift\z@
+  \expandafter\@text@composite@x
+  \csname\string#1-\string#2\endcsname}
+\def\@text@composite@x#1#2{%
+  \ifx#1\relax
+    \expandafter\@secondoftwo
+  \else
+    \expandafter\@firstoftwo
+  \fi
+  #1{#2}\egroup
+  \leavevmode
+  \expandafter\lower
+    \ifnum\ltjgetparameter{direction}=3
+      \ltjgetparameter{talbaselineshift}
+    \else\ifmmode
+      \z@
+    \else
+      \ltjgetparameter{yalbaselineshift}
+    \fi\fi
+    \box\z@
+  \endgroup}
+
 \endinput