| Revision | 6d7ed5fa7c91771c7612a9c4a46322756d2041cf (tree) |
|---|---|
| Time | 2022-01-12 19:58:44 |
| Author | Hironori Kitagawa <h_kitagawa2001@yaho...> |
| Commiter | Hironori Kitagawa |
\vadjust pre
src/ltj-direction.lua (diff)
src/luatexja-core.sty (diff)| @@ -924,6 +924,11 @@ end | ||
| 924 | 924 | -- adjust |
| 925 | 925 | do |
| 926 | 926 | local id_adjust = node.id 'adjust' |
| 927 | + local scan_keyword = token.scan_keyword | |
| 928 | + function luatexja.direction.adjust_begin() | |
| 929 | + if scan_keyword 'pre' then tex.sprint(cat_lp, '\\ltj@@vadjust@pre') | |
| 930 | + else tex.sprint(cat_lp, '\\ltj@@vadjust@post') end | |
| 931 | + end | |
| 927 | 932 | function luatexja.direction.check_adjust_direction() |
| 928 | 933 | start_time_measure 'box_primitive_hook' |
| 929 | 934 | local list_dir = get_adjust_dir_count() |
| @@ -65,7 +65,7 @@ | ||
| 65 | 65 | \expandafter\let\csname ifltj@in@latex\expandafter\endcsname |
| 66 | 66 | \csname iftrue\endcsname |
| 67 | 67 | \NeedsTeXFormat{LaTeX2e} |
| 68 | - \ProvidesPackage{luatexja-core}[2021-05-21 Core of LuaTeX-ja] | |
| 68 | + \ProvidesPackage{luatexja-core}[2022-01-12 Core of LuaTeX-ja] | |
| 69 | 69 | \fi %</LaTeX> |
| 70 | 70 | |
| 71 | 71 | %% Load prerequisite packages. |
| @@ -623,19 +623,22 @@ | ||
| 623 | 623 | |
| 624 | 624 | %%%% vadjust |
| 625 | 625 | \let\ltj@@orig@vadjust\vadjust |
| 626 | +\newluafunction\ltj@@vadjust@begin@inner | |
| 626 | 627 | \newluafunction\ltj@@vadjust@dirhook@inner |
| 627 | 628 | \newluafunction\ltj@@vadjust@check@dir@inner |
| 628 | 629 | \directlua{ |
| 629 | 630 | local t = lua.get_functions_table() |
| 631 | + t[\the\ltj@@vadjust@begin@inner] = luatexja.direction.adjust_begin | |
| 630 | 632 | t[\the\ltj@@vadjust@dirhook@inner] |
| 631 | 633 | = function () luatexja.direction.set_list_direction_hook('adj') end |
| 632 | - t[\the\ltj@@vadjust@check@dir@inner] | |
| 633 | - = luatexja.direction.check_adjust_direction | |
| 634 | + t[\the\ltj@@vadjust@check@dir@inner] = luatexja.direction.check_adjust_direction | |
| 634 | 635 | } |
| 636 | +\protected\luadef\ltj@@vadjust\ltj@@vadjust@begin@inner | |
| 635 | 637 | \luadef\ltj@@vadjust@dirhook\ltj@@vadjust@dirhook@inner |
| 636 | 638 | \protected\luadef\ltj@@vadjust@check@dir\ltj@@vadjust@check@dir@inner |
| 637 | -\protected\def\ltj@@vadjust{% | |
| 638 | - \ltj@@orig@vadjust\bgroup\ltj@@vadjust@dirhook | |
| 639 | +\def\ltj@@vadjust@pre{\ltj@@orig@vadjust pre\bgroup\ltj@@vadjust@dirhook | |
| 640 | + \aftergroup\ltj@@vadjust@check@dir\let\ltj@@next} | |
| 641 | +\def\ltj@@vadjust@post{\ltj@@orig@vadjust\bgroup\ltj@@vadjust@dirhook | |
| 639 | 642 | \aftergroup\ltj@@vadjust@check@dir\let\ltj@@next} |
| 640 | 643 | \let\vadjust\ltj@@vadjust %% PRIMITIVE |
| 641 | 644 |
Fork