| リビジョン | c4b0dcceef384d874e827bb1a8c134f6f0ab33dc (tree) |
|---|---|
| 日時 | 2020-09-26 14:46:33 |
| 作者 | Hironori Kitagawa <h_kitagawa2001@yaho...> |
| コミッター | Hironori Kitagawa |
Import from platex/2c50d2a22
doc/luatexja.dtx (diff)
src/patches/lltjfont.sty (diff) src/patches/lltjp-atbegshi.sty (diff)| @@ -5804,12 +5804,12 @@ and 4 means \emph{yoko} direction (horizontal typesetting). | ||
| 5804 | 5804 | \item |
| 5805 | 5805 | %<*en> |
| 5806 | 5806 | For an integer~<reg\_num> between 0~and~65535, |
| 5807 | -\verb+\ltjgetparameter{boxdim}{+<reg\_num>\verb+}+ returns the direction of | |
| 5807 | +\verb+\ltjgetparameter{boxdir}{+<reg\_num>\verb+}+ returns the direction of | |
| 5808 | 5808 | \cs{box}<reg\_num>. If this box register is void, the returned value is zero. |
| 5809 | 5809 | %</en> |
| 5810 | 5810 | %<*ja> |
| 5811 | 5811 | 0--65535の数<reg\_num>に対して， |
| 5812 | -\verb+\ltjgetparameter{boxdim}{+<reg\_num>\verb+}+ は，\cs{box}<reg\_num>に | |
| 5812 | +\verb+\ltjgetparameter{boxdir}{+<reg\_num>\verb+}+ は，\cs{box}<reg\_num>に | |
| 5813 | 5813 | 格納されているボックスの組方向を表す．もしこのレジスタが空の場合は，0が返される． |
| 5814 | 5814 | %</ja> |
| 5815 | 5815 |
| @@ -3,7 +3,7 @@ | ||
| 3 | 3 | % |
| 4 | 4 | |
| 5 | 5 | \NeedsTeXFormat{LaTeX2e} |
| 6 | -\ProvidesPackage{lltjfont}[2020-05-17 Patch to NFSS2 for LuaTeX-ja] | |
| 6 | +\ProvidesPackage{lltjfont}[2020-09-26 Patch to NFSS2 for LuaTeX-ja] | |
| 7 | 7 | |
| 8 | 8 | %% patching \DeclareTextComposite |
| 9 | 9 | \def\ltj@chardef@text@cmd#1{% |
| @@ -945,10 +945,10 @@ | ||
| 945 | 945 | |
| 946 | 946 | \let\romanprocess@table\process@table |
| 947 | 947 | \def\kanjiprocess@table{% |
| 948 | - \kanjiencoding{\kanjiencodingdefault}% | |
| 949 | - \kanjifamily{\kanjifamilydefault}% | |
| 950 | - \kanjiseries{\kanjiseriesdefault}% | |
| 951 | - \kanjishape{\kanjishapedefault}% | |
| 948 | + \kanjiencoding\kanjiencodingdefault% | |
| 949 | + \edef\k@family{\kanjifamilydefault}% | |
| 950 | + \edef\k@series{\kanjiseriesdefault}% | |
| 951 | + \edef\k@shape{\kanjishapedefault}% | |
| 952 | 952 | } |
| 953 | 953 | \def\process@table{% |
| 954 | 954 | \romanprocess@table |
| @@ -19,10 +19,30 @@ | ||
| 19 | 19 | \RequirePackage{expl3} |
| 20 | 20 | \ExplSyntaxOn\makeatletter |
| 21 | 21 | \box_new:N \l__platex_shipout_dummy_box |
| 22 | -\tl_put_left:Nn {\__shipout_execute_cont:} | |
| 23 | - {\tex_setbox:D \l__platex_shipout_dummy_box \tex_vbox:D \c_group_begin_token \yoko } | |
| 24 | -\tl_put_right:Nn {\__shipout_execute_cont:} {\c_group_end_token} | |
| 25 | -\ExplSyntaxOff | |
| 22 | +\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont: | |
| 23 | +\cs_set:Npn \__shipout_execute_cont: | |
| 24 | +{ | |
| 25 | + % if \l_shipout_box is not a \yoko-box (= horizontal writing), | |
| 26 | + % then make it a \yoko-box behorehand. | |
| 27 | + \unless\ifnum\ltjgetparameter{boxdir}{\l_shipout_box}=4 | |
| 28 | + \vbox_set:Nn \l_shipout_box { \yoko \box_use:N \l_shipout_box } | |
| 29 | + \fi | |
| 30 | + % if the current direction is not \yoko, | |
| 31 | + % then enclose \__shipout_execute_cont: with | |
| 32 | + % a dummy \yoko-box named \l__platex_shipout_dummy_box. | |
| 33 | + \ifnum\ltjgetparameter{direction}=4 | |
| 34 | + \__platex_original_shipout_execute_cont: | |
| 35 | + \else | |
| 36 | + \vbox_set:Nn \l__platex_shipout_dummy_box { | |
| 37 | + \yoko \__platex_original_shipout_execute_cont: | |
| 38 | + } | |
| 39 | + % [Limitation] the code above may discard some contents, | |
| 40 | + % so we'd like to put it back by \box\l__platex_shipout_dummy_box. | |
| 41 | + % however, an infinite loop occurs if we uncomment the line below | |
| 42 | + % so we can't. | |
| 43 | + %\box_use:N \l__platex_shipout_dummy_box | |
| 44 | + \fi | |
| 45 | +} | |
| 26 | 46 | %</ltshipout>----------------------------------- |
| 27 | 47 | |
| 28 | 48 | \expandafter\endinput |
Fork