| リビジョン | c0b8216df4dcf459d8618a9d3ca9b840e77d1372 (tree) |
|---|---|
| 日時 | 2020-01-22 16:07:10 |
| 作者 | Hironori Kitagawa <h_kitagawa2001@yaho...> |
| コミッター | Hironori Kitagawa |
ltj-jfmglue.lua: bugfix on [x]kanjiskip (WIP)
src/ltj-jfmglue.lua (diff)| @@ -803,7 +803,9 @@ do | ||
| 803 | 803 | blend_diffmet( |
| 804 | 804 | getfield(gb, 'stretch'), getfield(ga, 'stretch'), db, da), |
| 805 | 805 | -blend_diffmet( |
| 806 | - -getfield(gb, 'shrink'), -getfield(ga, 'shrink'), db, da)) | |
| 806 | + -getfield(gb, 'shrink'), -getfield(ga, 'shrink'), db, da), | |
| 807 | + getfield(gb, 'stretch_order'), getfield(gb, 'shrink_order')) | |
| 808 | + -- {stretch, shrink}_order: [x]kanjiskip のとき | |
| 807 | 809 | node_free(ga) |
| 808 | 810 | return gb |
| 809 | 811 | elseif k == bk_ak then |
| @@ -863,7 +865,8 @@ do | ||
| 863 | 865 | bn and (bn*getfield(kanji_skip, 'width')) or 0, |
| 864 | 866 | bp and (bp*getfield(kanji_skip, 'stretch')) or 0, |
| 865 | 867 | bh and (bh*getfield(kanji_skip, 'shrink')) or 0, |
| 866 | - 0, 0) | |
| 868 | + bp and getfield(kanji_skip, 'stretch_order') or 0, | |
| 869 | + bh and getfield(kanji_skip, 'shrink_order') or 0) | |
| 867 | 870 | set_attr(g, attr_icflag, KANJI_SKIP_JFM) |
| 868 | 871 | return g |
| 869 | 872 | end |
| @@ -908,11 +911,11 @@ do | ||
| 908 | 911 | Np.class) |
| 909 | 912 | local g = calc_ja_ja_aux(gb, ga, db, da) |
| 910 | 913 | local k |
| 911 | - if (pmc==qmc) and (qm.var==pm.var) then | |
| 912 | - gb = get_kanjiskip_low(false, qm, bn, bp, bh) | |
| 913 | - ga = get_kanjiskip_low(false, pm, an, ap, ah) | |
| 914 | - k = calc_ja_ja_aux(gb, ga, db, da) | |
| 915 | - end | |
| 914 | + --if (pmc==qmc) and (qm.var==pm.var) then | |
| 915 | + gb = get_kanjiskip_low(false, qm, bn, bp, bh) | |
| 916 | + ga = get_kanjiskip_low(false, pm, an, ap, ah) | |
| 917 | + k = calc_ja_ja_aux(gb, ga, db, da) | |
| 918 | + --end | |
| 916 | 919 | return g, k |
| 917 | 920 | end |
| 918 | 921 | end |
| @@ -946,7 +949,8 @@ do | ||
| 946 | 949 | bn and (bn*getfield(xkanji_skip, 'width')) or 0, |
| 947 | 950 | bp and (bp*getfield(xkanji_skip, 'stretch')) or 0, |
| 948 | 951 | bh and (bh*getfield(xkanji_skip, 'shrink')) or 0, |
| 949 | - 0, 0) | |
| 952 | + bp and getfield(xkanji_skip, 'stretch_order') or 0, | |
| 953 | + bh and getfield(xkanji_skip, 'shrink_order') or 0) | |
| 950 | 954 | set_attr(g, attr_icflag, XKANJI_SKIP_JFM) |
| 951 | 955 | return g |
| 952 | 956 | end |
Fork