Merge branch 'kitagawa_test' of git.sourceforge.jp:/gitroot/luatex-ja/luatexja into...

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

diff --git a/src/patches/lltjp-tascmac.sty b/src/patches/lltjp-tascmac.sty
index 489df1b..4f03d1f 100644 (file)
--- a/src/patches/lltjp-tascmac.sty
+++ b/src/patches/lltjp-tascmac.sty
@@ -4,10 +4,15 @@
 % \dimen...=\tbaselineshift ==> \dimen...=\ltj@tablshift sp
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-tascmac}[2014/12/17 Patch to (t)ascmac for LuaTeX-ja]
+\ProvidesPackage{lltjp-tascmac}[2014/12/18 Patch to (t)ascmac for LuaTeX-ja]
 
 \RequirePackage{tascmac,luatexja}
 
+%% use Type1 font for ascgrp
+\ifdefined\pdfmapline
+  \pdfmapline{+ascgrp <ascgrp.pfb}
+\fi
+
 %% boxnote environment
 \def\boxnote{\par\vspace{\baselineskip}
 \@savetbaselineshift\ltj@tablshift sp\ltj@tablshift\z@
@@ -39,9 +44,10 @@
 
 %% itembox environment
 \def\@itembox[#1]#2{%
-  \@savetbaselineshift\ltj@tablshift sp\ltj@tablshift\z@
   \par\vspace{.3\baselineskip}%
-  \setbox\@iboxstr=\hbox{#2}\@itemh\ht\@iboxstr\advance\@itemh\dp\@iboxstr
+  \setbox\@iboxstr=\hbox{#2}%
+  \@savetbaselineshift\ltj@tablshift sp\ltj@tablshift\z@
+  \@itemh\ht\@iboxstr\advance\@itemh\dp\@iboxstr
   \vspace{.5\@itemh}\bgroup\@scw\linewidth
   \advance\@scw-20pt\@iboxpos={#1}%
   \setbox\scb@x=\hbox to\@scw\bgroup\begin{minipage}{\@scw}%
@@ -49,11 +55,10 @@
   \vspace*{.5\@itemh}}%
 
 %% \keytop
-\def\@keytop[#1]#2{\ltj@tablshift\z@
-{\setbox0=\hbox{\shortstack{#2}}%
+\def\@keytop[#1]#2{%
+{\setbox0=\hbox{\shortstack{#2}}\ltj@tablshift\z@%
 \dimen0=\wd0\advance\dimen0 5pt\dimen1=\dp0\advance\dimen1 2.5pt%
 \setbox\scscb@x=\hbox to\dimen0{%
-\iftdir\tate\else\yoko\fi
 \@scw\wd0\hfil\vtop{\offinterlineskip
 \thinlines\setlength{\unitlength}{1pt}\hrule\kern2.3pt\@hobox{tl}{tr}5%
 \kern-2.4pt\box0\@hobox{bl}{br}5\kern-.25pt\hrule}\hfil}\dimen0=\dp\scscb@x%
@@ -63,8 +68,8 @@
 \boxmaxdepth=\dimen1\fi\fi \mbox{}\vbox{\box0}\fi}}
 
 %% \mask
-\def\mask#1#2{\ltj@tablshift\z@
-{\setbox\@bwsp=\hbox{#1}\setbox0=\hbox{\@ascgrp#2}%
+\def\mask#1#2{%
+{\setbox\@bwsp=\hbox{#1}\ltj@tablshift\z@\setbox0=\hbox{\@ascgrp#2}%
 \dimen0=\wd\@bwsp\dimen1=\ht\@bwsp\advance\dimen1\dp\@bwsp\dimen2=-\dimen1
 \setdim@{\dimen0}{\wd0}\setdim@{\dimen1}{\ht0}%
 \setbox\@@bwsp=\hbox to\dimen0{\leaders
@@ -75,7 +80,7 @@
 \mbox{}\hbox to\wd\@@bwsp{\hbox to0pt{\box\@@bwsp\hss}\hss\unhbox\@bwsp\hss}}}
 
 %% \maskbox
-\def\Maskbox#1#2#3#4#5#6{{\ltj@tablshift\z@
+\def\Maskbox#1#2#3#4#5#6{{\setbox2=\hbox{#6}\ltj@tablshift\z@
 \setbox0=\hbox{\@ascgrp#3}%
 \dimen0=#1\@setdim{\dimen0}{\wd0}\dimen1=#2\@setdim{\dimen1}{\ht0}%
 \ifx#4c\skip0=0pt plus1fil\skip1=\skip0\fi
@@ -85,8 +90,20 @@
 \hbox{\@ascgrp#3}\vfil}\hfil}\hss}%
 \vrule width#5\vbox to\dimen1{\hrule height#5\vfil
 \dimen3=#5\advance\dimen0-2\dimen3\advance\dimen0 .15pt
-\hbox to\dimen0{\hskip\skip0\relax#6\hskip\skip1}%
+\hbox to\dimen0{\hskip\skip0\box2\hskip\skip1}%
 \vfil\hrule height#5}\vrule width#5}}}
 
+%% \yen
+%
+% \changes{1996/03/13}{v1.1}{Append \cs{leavevmode} in
+%     \cs{yen}, \cs{return}, \cs{Return} command.}
+%
+\def\yen{\leavevmode\hbox{\yoko%
+\setbox0=\hbox{Y}Y\kern-.97\wd0\vbox{\hrule height.1ex width.98\wd0
+\kern.33ex\hrule height.1ex width.98\wd0\kern.45ex}}}
+%
+%% return-key
+\def\return{\leavevmode\hbox{\yoko\@ascgrp\char"20}}
+\def\Return{\leavevmode\hbox{\yoko\@ascgrp @}}
 
 \endinput