fix #37093

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

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 630224d..a469158 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,23 +3,32 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2016/04/01 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2017/03/20 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@{%
-  \expandafter\edef\csname \ltj@chardef@text@cmd@name\endcsname{%
-    \noexpand\ltjalchar\the\ltj@tempcnta\space
-  }%
+  \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
 
 
@@ -46,21 +55,36 @@
 \ifdefined\cHT\else\newdimen\cHT\fi
 %\let\afont\font
 
+\let\ystrutbox\strutbox
 \newbox\dstrutbox
 \newbox\tstrutbox
 \newbox\zstrutbox
+\def\strutbox{%
+  \ifnum\ltjgetparameter{direction}=1 \dstrutbox       % dtou
+  \else\ifnum\ltjgetparameter{direction}=3 \tstrutbox  % tate
+  \else\ifnum\ltjgetparameter{direction}=11 \zstrutbox % utod
+  \else\ystrutbox % yoko
+  \fi\fi\fi
+}
 \def\strut{\relax
   \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 % tate and utod
+    \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi
+  \else\ifnum\ltjgetparameter{direction}=3 % tate
     \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
+  \else % utod
+    \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi
   \fi\fi
 }
+
+\def\ystrut{\relax\hbox{\yoko
+   \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}}
 \def\tstrut{\relax\hbox{\tate
    \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
-\def\zstrut{\relax\hbox{\tate
+\def\dstrut{\relax\hbox{\dtou
+   \ifmmode\copy\dstrutbox\else\unhcopy\dstrutbox\fi}}
+\def\zstrut{\relax\hbox{\utod
    \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}}
 
 {%
@@ -370,7 +394,7 @@
       \baselineskip\f@linespread\baselineskip
       \normalbaselineskip\baselineskip
       \adjustbaseline
-      \setbox\strutbox\hbox{\yoko
+      \setbox\ystrutbox\hbox{\yoko
           \vrule\@width\z@
                 \@height.7\baselineskip \@depth.3\baselineskip}%
       \setbox\dstrutbox\hbox{\dtou
@@ -379,10 +403,10 @@
       \setbox\tstrutbox\hbox{\tate
           \vrule\@width\z@
                 \@height.5\baselineskip \@depth.5\baselineskip}%
-      \setbox\zstrutbox\hbox{\tate
+      \setbox\zstrutbox\hbox{\utod
           \vrule\@width\z@
                 \@height.7\baselineskip \@depth.3\baselineskip}%
-        \let\size@update\relax}}
+     \let\size@update\relax}}
 
 \ifdefined\newluafunction
   \newluafunction\ltj@@adjust@baseline@inner
@@ -476,7 +500,7 @@
   \csname D@\k@encoding\endcsname
   \let\kenc@update\relax
   \let\ck@encoding\k@encoding
-  \edef\tmp@enc{'\luatexluaescapestring{\k@encoding}'}
+  \edef\tmp@enc{'\luatexluaescapestring{\k@encoding}'}%
   \directlua{luatexja.jfont.is_kyenc(\tmp@enc)}\ifin@%
     \let\cy@encoding\k@encoding
   \else
@@ -591,9 +615,6 @@
 }
 \@onlypreamble\romanprocess@table
 \@onlypreamble\kanjiprocess@table
-\DeclareTextCommandDefault{\textunderscore}{%
-  \leavevmode\kern.06em
-  \vbox{\hrule\@width.3em}}
 
 %%%%%% LuaTeX-ja specific