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

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index e53384d..738e192 100644
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2014/10/29 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
@@ -44,6 +44,13 @@
    \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
@@ -57,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
@@ -88,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
@@ -145,6 +152,7 @@
               \@empty
             \else \reserved@a
             \fi
+     \directlua{luatexja.jfont.add_ffam('\luatexluaescapestring{#2}')}%
     }%
 }
 \def\DeclareKanjiFamily#1#2#3{%
@@ -157,6 +165,7 @@
               \@empty
             \else \reserved@a
             \fi
+     \directlua{luatexja.jfont.add_kfam('\luatexluaescapestring{#2}')}%
      }%
 }
 \def\DeclareKanjiSubstitution#1#2#3#4{%
@@ -356,10 +365,47 @@
           \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{%
+
+\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 = 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
+  }\endgroup
+  \def\adjustbaseline{\luafunction\ltj@@adjust@baseline@inner
+     \cvs\normalbaselineskip}
+\else
+  \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
@@ -376,7 +422,9 @@
     \divide\adjust@dimen\tw@
     \advance\adjust@dimen0.5\dp\adjust@box@aux
     \advance\adjust@dimen-\dp\adjust@box
-    \ltj@tablshift=\adjust@dimen}
+    \ltj@tablshift=\adjust@dimen
+  }
+\fi
 \DeclareRobustCommand\romanencoding[1]{%
     \expandafter\ifx\csname T@#1\endcsname\relax
       \@latex@error{Encoding scheme `#1' unknown}\@eha
@@ -443,65 +491,39 @@
 \newif\if@notkfam
 \newif\if@notffam
 \newif\if@tempswz
-\newif\if@ltj@use@fd
-\@ltj@use@fdtrue
+\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\if@ltj@use@fd
-     % 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
-  \else % do not use font definition file
-     \@notkfamtrue%
-  \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}}
@@ -701,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