| Revision | a57adb4a8e63757f7389a07d28db8fb679ddc1ba (tree) |
|---|---|
| Time | 2019-09-25 10:44:09 |
| Author | Hironori Kitagawa <h_kitagawa2001@yaho...> |
| Commiter | Hironori Kitagawa |
Make \adjustbaseline, \userelfont, \bou, \kasen robust
src/lltjext.sty (diff) src/patches/lltjfont.sty (diff)| @@ -3,7 +3,7 @@ | ||
| 3 | 3 | % |
| 4 | 4 | |
| 5 | 5 | \NeedsTeXFormat{LaTeX2e} |
| 6 | -\ProvidesPackage{lltjext}[2018/10/07 v1.2k-ltj-10 Macros for vertical writing] | |
| 6 | +\ProvidesPackage{lltjext}[2019/09/25 v1.2k-ltj-11 Macros for vertical writing] | |
| 7 | 7 | \RequirePackage{luatexja} |
| 8 | 8 | \newcount\ltj@ext@dir |
| 9 | 9 | \let\ltj@lltjext@orig@tabular=\tabular |
| @@ -631,7 +631,7 @@ | ||
| 631 | 631 | %%% bou |
| 632 | 632 | %%% |
| 633 | 633 | \def\boutenchar{\char\euc"A1A2}%" |
| 634 | -\def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end} | |
| 634 | +\DeclareRobustCommand\bou[1]{\ifvmode\leavevmode\fi\@bou#1\end} | |
| 635 | 635 | \def\@bou#1{% |
| 636 | 636 | \ifx#1\end \let\ltj@@next=\relax |
| 637 | 637 | \else |
| @@ -648,7 +648,7 @@ | ||
| 648 | 648 | \fi\ltj@@next} |
| 649 | 649 | |
| 650 | 650 | %%% kasen |
| 651 | -\def\kasen#1{% | |
| 651 | +\DeclareRobustCommand\kasen[1]{% | |
| 652 | 652 | \ifnum\ltjgetparameter{direction}=3\relax |
| 653 | 653 | \setbox\z@\hbox{#1}\leavevmode\raise.7\zw |
| 654 | 654 | \hbox to\z@{\vrule\@width\wd\z@ \@depth\z@ \@height.4\p@\hss}% |
| @@ -3,7 +3,7 @@ | ||
| 3 | 3 | % |
| 4 | 4 | |
| 5 | 5 | \NeedsTeXFormat{LaTeX2e} |
| 6 | -\ProvidesPackage{lltjfont}[2019/08/21 Patch to NFSS2 for LuaTeX-ja] | |
| 6 | +\ProvidesPackage{lltjfont}[2019/09/25 Patch to NFSS2 for LuaTeX-ja] | |
| 7 | 7 | |
| 8 | 8 | \def\ltj@chardef@text@cmd#1{% |
| 9 | 9 | \let\@ifdefinable\@@ifdefinable% |
| @@ -308,7 +308,7 @@ | ||
| 308 | 308 | \fi |
| 309 | 309 | } |
| 310 | 310 | \newif\if@knjcmd |
| 311 | -\def\userelfont{\@knjcmdtrue} | |
| 311 | +\DeclareRobustCommand\userelfont{\@knjcmdtrue} | |
| 312 | 312 | |
| 313 | 313 | |
| 314 | 314 | \RequirePackage{everysel} |
| @@ -465,7 +465,7 @@ | ||
| 465 | 465 | setdimen('cHT', ht+dp) |
| 466 | 466 | end |
| 467 | 467 | }\endgroup |
| 468 | -\def\adjustbaseline{\luafunction\ltj@@adjust@baseline@inner | |
| 468 | +\DeclareRobustCommand\adjustbaseline{\luafunction\ltj@@adjust@baseline@inner | |
| 469 | 469 | \cvs\normalbaselineskip} |
| 470 | 470 | \DeclareRobustCommand\romanencoding[1]{% |
| 471 | 471 | \expandafter\ifx\csname T@#1\endcsname\relax |
| @@ -773,7 +773,7 @@ | ||
| 773 | 773 | %%%%%% Alternate Japanese Fonts |
| 774 | 774 | %%%% \DeclareAlternateKanjiFont<Benc><Bfam><Bser><Bshape><Aenc><Afam><Aser><Ashape><range> |
| 775 | 775 | % いつも global |
| 776 | -\DeclareRobustCommand\DeclareAlternateKanjiFont[9]{% | |
| 776 | +\def\DeclareAlternateKanjiFont#1#2#3#4#5#6#7#8#9{% | |
| 777 | 777 | \edef\@temp{#9}% |
| 778 | 778 | \ifx\@temp\@empty\else |
| 779 | 779 | {\def\ltj@temp@bfont{#1/#2/#3/#4}\def\ltj@temp@afont{#5/#6/#7/#8}% |
Fork