| リビジョン | 4856b74dda7a88ab2614c26894a27bdccf005e99 (tree) |
|---|---|
| 日時 | 2019-09-12 23:28:05 |
| 作者 | Hironori Kitagawa <h_kitagawa2001@yaho...> |
| コミッター | Hironori Kitagawa |
wip
src/ltj-jfont.lua (diff) src/ltj-lotf_aux.lua (diff) src/luatexja.lua (diff)| @@ -746,53 +746,41 @@ local font_extra_basename = {} -- key: basename | ||
| 746 | 746 | |
| 747 | 747 | local list_rotate_glyphs |
| 748 | 748 | do |
| 749 | - -- output of function_uax50.lua | |
| 750 | - -- UAX#50 for Unicode 12.1.0 | |
| 751 | - -- t[0] = true | |
| 749 | + local ceil = math.ceil | |
| 750 | + -- output of function_uax50.lua | |
| 751 | + -- UAX#50 for Unicode 12.1.0 | |
| 752 | + -- t[0] = true | |
| 752 | 753 | local t={ 0, 167, 168, 169, 170, 174, 175, 177, 178, 188, 191, 215, 216, 247, 248, 746, 748, 888, 890, 896, 900, 907, 908, 909, 910, 930, 931, 1328, 1329, 1367, 1369, 1419, 1421, 1424, 1425, 1480, 1488, 1515, 1519, 1525, 1536, 1565, 1566, 1806, 1807, 1867, 1869, 1970, 1984, 2043, 2045, 2094, 2096, 2111, 2112, 2140, 2142, 2143, 2144, 2155, 2208, 2229, 2230, 2238, 2259, 2436, 2437, 2445, 2447, 2449, 2451, 2473, 2474, 2481, 2482, 2483, 2486, 2490, 2492, 2501, 2503, 2505, 2507, 2511, 2519, 2520, 2524, 2526, 2527, 2532, 2534, 2559, 2561, 2564, 2565, 2571, 2575, 2577, 2579, 2601, 2602, 2609, 2610, 2612, 2613, 2615, 2616, 2618, 2620, 2621, 2622, 2627, 2631, 2633, 2635, 2638, 2641, 2642, 2649, 2653, 2654, 2655, 2662, 2679, 2689, 2692, 2693, 2702, 2703, 2706, 2707, 2729, 2730, 2737, 2738, 2740, 2741, 2746, 2748, 2758, 2759, 2762, 2763, 2766, 2768, 2769, 2784, 2788, 2790, 2802, 2809, 2816, 2817, 2820, 2821, 2829, 2831, 2833, 2835, 2857, 2858, 2865, 2866, 2868, 2869, 2874, 2876, 2885, 2887, 2889, 2891, 2894, 2902, 2904, 2908, 2910, 2911, 2916, 2918, 2936, 2946, 2948, 2949, 2955, 2958, 2961, 2962, 2966, 2969, 2971, 2972, 2973, 2974, 2976, 2979, 2981, 2984, 2987, 2990, 3002, 3006, 3011, 3014, 3017, 3018, 3022, 3024, 3025, 3031, 3032, 3046, 3067, 3072, 3085, 3086, 3089, 3090, 3113, 3114, 3130, 3133, 3141, 3142, 3145, 3146, 3150, 3157, 3159, 3160, 3163, 3168, 3172, 3174, 3184, 3191, 3213, 3214, 3217, 3218, 3241, 3242, 3252, 3253, 3258, 3260, 3269, 3270, 3273, 3274, 3278, 3285, 3287, 3294, 3295, 3296, 3300, 3302, 3312, 3313, 3315, 3328, 3332, 3333, 3341, 3342, 3345, 3346, 3397, 3398, 3401, 3402, 3408, 3412, 3428, 3430, 3456, 3458, 3460, 3461, 3479, 3482, 3506, 3507, 3516, 3517, 3518, 3520, 3527, 3530, 3531, 3535, 3541, 3542, 3543, 3544, 3552, 3558, 3568, 3570, 3573, 3585, 3643, 3647, 3676, 3713, 3715, 3716, 3717, 3718, 3723, 3724, 3748, 3749, 3750, 3751, 3774, 3776, 3781, 3782, 3783, 3784, 3790, 3792, 3802, 3804, 3808, 3840, 3912, 3913, 3949, 3953, 3992, 3993, 4029, 4030, 4045, 4046, 4059, 4096, 4294, 4295, 4296, 4301, 4302, 4304, 4352, 4608, 4681, 4682, 4686, 4688, 4695, 4696, 4697, 4698, 4702, 4704, 4745, 4746, 4750, 4752, 4785, 4786, 4790, 4792, 4799, 4800, 4801, 4802, 4806, 4808, 4823, 4824, 4881, 4882, 4886, 4888, 4955, 4957, 4989, 4992, 5018, 5024, 5110, 5112, 5118, 5120, 5121, 5760, 5789, 5792, 5881, 5888, 5901, 5902, 5909, 5920, 5943, 5952, 5972, 5984, 5997, 5998, 6001, 6002, 6004, 6016, 6110, 6112, 6122, 6128, 6138, 6144, 6159, 6160, 6170, 6176, 6265, 6272, 6315, 6400, 6431, 6432, 6444, 6448, 6460, 6464, 6465, 6468, 6510, 6512, 6517, 6528, 6572, 6576, 6602, 6608, 6619, 6622, 6684, 6686, 6751, 6752, 6781, 6783, 6794, 6800, 6810, 6816, 6830, 6832, 6847, 6912, 6988, 6992, 7037, 7040, 7156, 7164, 7224, 7227, 7242, 7245, 7305, 7312, 7355, 7357, 7368, 7376, 7419, 7424, 7674, 7675, 7958, 7960, 7966, 7968, 8006, 8008, 8014, 8016, 8024, 8025, 8026, 8027, 8028, 8029, 8030, 8031, 8062, 8064, 8117, 8118, 8133, 8134, 8148, 8150, 8156, 8157, 8176, 8178, 8181, 8182, 8191, 8192, 8214, 8215, 8224, 8226, 8240, 8242, 8251, 8253, 8258, 8259, 8263, 8266, 8273, 8274, 8293, 8294, 8306, 8308, 8335, 8336, 8349, 8352, 8384, 8400, 8413, 8417, 8418, 8421, 8433, 8450, 8451, 8458, 8463, 8464, 8467, 8469, 8470, 8472, 8478, 8484, 8485, 8486, 8487, 8488, 8489, 8490, 8494, 8495, 8501, 8512, 8517, 8523, 8524, 8526, 8527, 8586, 8588, 8592, 8734, 8735, 8756, 8758, 8960, 8968, 8972, 8992, 8996, 9001, 9003, 9004, 9085, 9115, 9150, 9166, 9167, 9168, 9169, 9180, 9186, 9251, 9252, 9472, 9632, 9754, 9760, 10088, 10102, 10132, 11026, 11056, 11088, 11098, 11124, 11126, 11158, 11160, 11192, 11218, 11219, 11244, 11248, 11264, 11311, 11312, 11359, 11360, 11508, 11513, 11558, 11559, 11560, 11565, 11566, 11568, 11624, 11631, 11633, 11647, 11671, 11680, 11687, 11688, 11695, 11696, 11703, 11704, 11711, 11712, 11719, 11720, 11727, 11728, 11735, 11736, 11743, 11744, 11856, 12296, 12306, 12308, 12320, 12336, 12337, 12448, 12449, 12540, 12541, 42192, 42540, 42560, 42744, 42752, 42944, 42946, 42951, 42999, 43052, 43056, 43066, 43072, 43128, 43136, 43206, 43214, 43226, 43232, 43348, 43359, 43360, 43392, 43470, 43471, 43482, 43486, 43519, 43520, 43575, 43584, 43598, 43600, 43610, 43612, 43715, 43739, 43767, 43777, 43783, 43785, 43791, 43793, 43799, 43808, 43815, 43816, 43823, 43824, 43880, 43888, 44014, 44016, 44026, 55296, 57344, 64256, 64263, 64275, 64280, 64285, 64311, 64312, 64317, 64318, 64319, 64320, 64322, 64323, 64325, 64326, 64450, 64467, 64832, 64848, 64912, 64914, 64968, 65008, 65022, 65024, 65040, 65056, 65072, 65097, 65104, 65112, 65119, 65123, 65127, 65136, 65141, 65142, 65277, 65279, 65280, 65288, 65290, 65293, 65294, 65306, 65311, 65339, 65340, 65341, 65342, 65343, 65344, 65371, 65471, 65474, 65480, 65482, 65488, 65490, 65496, 65498, 65501, 65507, 65508, 65512, 65519, 65529, 65532, 65536, 65548, 65549, 65575, 65576, 65595, 65596, 65598, 65599, 65614, 65616, 65630, 65664, 65787, 65792, 65795, 65799, 65844, 65847, 65935, 65936, 65948, 65952, 65953, 66000, 66046, 66176, 66205, 66208, 66257, 66272, 66300, 66304, 66340, 66349, 66379, 66384, 66427, 66432, 66462, 66463, 66500, 66504, 66518, 66560, 66718, 66720, 66730, 66736, 66772, 66776, 66812, 66816, 66856, 66864, 66916, 66927, 66928, 67072, 67383, 67392, 67414, 67424, 67432, 67584, 67590, 67592, 67593, 67594, 67638, 67639, 67641, 67644, 67645, 67647, 67670, 67671, 67743, 67751, 67760, 67808, 67827, 67828, 67830, 67835, 67868, 67871, 67898, 67903, 67904, 68000, 68024, 68028, 68048, 68050, 68100, 68101, 68103, 68108, 68116, 68117, 68120, 68121, 68150, 68152, 68155, 68159, 68169, 68176, 68185, 68192, 68256, 68288, 68327, 68331, 68343, 68352, 68406, 68409, 68438, 68440, 68467, 68472, 68498, 68505, 68509, 68521, 68528, 68608, 68681, 68736, 68787, 68800, 68851, 68858, 68904, 68912, 68922, 69216, 69247, 69376, 69416, 69424, 69466, 69600, 69623, 69632, 69710, 69714, 69744, 69759, 69826, 69837, 69838, 69840, 69865, 69872, 69882, 69888, 69941, 69942, 69959, 69968, 70007, 70016, 70094, 70096, 70112, 70113, 70133, 70144, 70162, 70163, 70207, 70272, 70279, 70280, 70281, 70282, 70286, 70287, 70302, 70303, 70314, 70320, 70379, 70384, 70394, 70400, 70404, 70405, 70413, 70415, 70417, 70419, 70441, 70442, 70449, 70450, 70452, 70453, 70458, 70459, 70469, 70471, 70473, 70475, 70478, 70480, 70481, 70487, 70488, 70493, 70500, 70502, 70509, 70512, 70517, 70656, 70746, 70747, 70748, 70749, 70752, 70784, 70856, 70864, 70874, 71168, 71237, 71248, 71258, 71264, 71277, 71296, 71353, 71360, 71370, 71424, 71451, 71453, 71468, 71472, 71488, 71680, 71740, 71840, 71923, 71935, 71936, 72096, 72104, 72106, 72152, 72154, 72165, 72384, 72441, 72704, 72713, 72714, 72759, 72760, 72774, 72784, 72813, 72816, 72848, 72850, 72872, 72873, 72887, 72960, 72967, 72968, 72970, 72971, 73015, 73018, 73019, 73020, 73022, 73023, 73032, 73040, 73050, 73056, 73062, 73063, 73065, 73066, 73103, 73104, 73106, 73107, 73113, 73120, 73130, 73440, 73465, 73664, 73714, 73727, 74650, 74752, 74863, 74864, 74869, 74880, 75076, 92160, 92729, 92736, 92767, 92768, 92778, 92782, 92784, 92880, 92910, 92912, 92918, 92928, 92998, 93008, 93018, 93019, 93026, 93027, 93048, 93053, 93072, 93760, 93851, 93952, 94027, 94031, 94088, 94095, 94112, 113664, 113771, 113776, 113789, 113792, 113801, 113808, 113818, 113820, 113828, 119296, 119366, 119808, 119893, 119894, 119965, 119966, 119968, 119970, 119971, 119973, 119975, 119977, 119981, 119982, 119994, 119995, 119996, 119997, 120004, 120005, 120070, 120071, 120075, 120077, 120085, 120086, 120093, 120094, 120122, 120123, 120127, 120128, 120133, 120134, 120135, 120138, 120145, 120146, 120486, 120488, 120780, 120782, 120832, 122880, 122887, 122888, 122905, 122907, 122914, 122915, 122917, 122918, 122923, 123136, 123181, 123184, 123198, 123200, 123210, 123214, 123216, 123584, 123642, 123647, 123648, 124928, 125125, 125127, 125143, 125184, 125260, 125264, 125274, 125278, 125280, 126065, 126133, 126209, 126270, 126464, 126468, 126469, 126496, 126497, 126499, 126500, 126501, 126503, 126504, 126505, 126515, 126516, 126520, 126521, 126522, 126523, 126524, 126530, 126531, 126535, 126536, 126537, 126538, 126539, 126540, 126541, 126544, 126545, 126547, 126548, 126549, 126551, 126552, 126553, 126554, 126555, 126556, 126557, 126558, 126559, 126560, 126561, 126563, 126564, 126565, 126567, 126571, 126572, 126579, 126580, 126584, 126585, 126589, 126590, 126591, 126592, 126602, 126603, 126620, 126625, 126628, 126629, 126634, 126635, 126652, 126704, 126706, 129024, 129036, 129040, 129096, 129104, 129114, 129120, 129160, 129168, 129198, 917505, 917506, 917536, 917632, 917760, 918000 } |
| 753 | - local function rotate_in_uax50(i) | |
| 754 | - local lo, hi = 1, #t | |
| 755 | - while lo < hi do | |
| 756 | - local mi = math.ceil((lo+hi)/2) | |
| 757 | - if t[mi]<=i then lo=mi else hi=mi-1 end | |
| 758 | - end | |
| 759 | - return lo%2==1 | |
| 760 | - end | |
| 761 | - list_rotate_glyphs = function (dest, id) | |
| 762 | - if id.specification and id.resources then | |
| 763 | - local rot = {} | |
| 764 | - for i,_ in pairs(id.characters) do | |
| 765 | - if rotate_in_uax50(i) then rot[i] = true end | |
| 766 | - end | |
| 767 | - if id.resources.sequences then | |
| 768 | - for _,i in pairs(id.resources.sequences) do | |
| 769 | - if i.order[1]== 'vert' and i.type == 'gsub_single' and i.steps then | |
| 770 | - for _,j in pairs(i.steps) do | |
| 771 | - if type(j)=='table' then | |
| 772 | - if type(j.coverage)=='table' then | |
| 773 | - for i,_ in pairs(j.coverage) do rot[i]=nil end | |
| 774 | - end | |
| 775 | - end | |
| 776 | - end | |
| 777 | - end | |
| 778 | - end; end | |
| 779 | - -- コードポイントが共有されているグリフについて | |
| 780 | - if id.resources.duplicates then | |
| 781 | - for i,v in pairs(id.resources.duplicates) do | |
| 782 | - local f = rot[i] | |
| 783 | - for j,_ in pairs(v) do f = f and rot[j] end | |
| 784 | - rot[i]=f | |
| 785 | - for j,_ in pairs(v) do rot[j] = f end | |
| 786 | - end; end | |
| 787 | - | |
| 788 | - for i,_ in pairs(rot) do | |
| 789 | - dest = dest or {} | |
| 790 | - dest.rotation = dest.rotation or {} | |
| 791 | - dest.rotation[i] = true | |
| 792 | - end | |
| 754 | + local function rotate_in_uax50(i) | |
| 755 | + local lo, hi = 1, #t | |
| 756 | + while lo < hi do | |
| 757 | + local mi = ceil((lo+hi)/2) | |
| 758 | + if t[mi]<=i then lo=mi else hi=mi-1 end | |
| 759 | + end | |
| 760 | + return lo%2==1 | |
| 761 | + end | |
| 762 | + local vert_vrt2 = { vert=true, vrt2 = true } | |
| 763 | + list_rotate_glyphs = function (dest, id) | |
| 764 | + local rot = {} | |
| 765 | + for i,_ in pairs(id.characters) do | |
| 766 | + if rotate_in_uax50(i) then rot[i] = true end | |
| 767 | + end | |
| 768 | + ltju.loop_over_feat(id, vert_vrt2, function (i,k) rot[i] = nil end) | |
| 769 | + -- コードポイントが共有されているグリフについて | |
| 770 | + if id.resources and id.resources.duplicates then | |
| 771 | + for i,v in pairs(id.resources.duplicates) do | |
| 772 | + local f = rot[i] | |
| 773 | + for j,_ in pairs(v) do f = f and rot[j] end | |
| 774 | + rot[i]=f | |
| 775 | + for j,_ in pairs(v) do rot[j] = f end | |
| 793 | 776 | end |
| 794 | - return dest | |
| 795 | - end | |
| 777 | + end | |
| 778 | + for i,_ in pairs(rot) do | |
| 779 | + dest = dest or {}; dest.rotation = dest.rotation or {} | |
| 780 | + dest.rotation[i] = true | |
| 781 | + end | |
| 782 | + return dest | |
| 783 | + end | |
| 796 | 784 | end |
| 797 | 785 | |
| 798 | 786 | -- vertical metrics |
| @@ -882,7 +870,7 @@ do | ||
| 882 | 870 | [0xFF3B]=0xFE47, [0xFF3D]=0xFE48, |
| 883 | 871 | } |
| 884 | 872 | local vert_jpotf_table = {} |
| 885 | - local function add_vform(coverage, vform, ft, add_vert, jpotf_vert) | |
| 873 | + local function add_vform(i, k, vform, ft, add_vert, jpotf_vert) | |
| 886 | 874 | if type(coverage)~='table' then return end |
| 887 | 875 | for i,v in pairs(vert_form_table) do |
| 888 | 876 | if not coverage[i] and ft.characters[v] then vform[i] = v end |
| @@ -916,7 +904,7 @@ luatexbase.add_to_callback( | ||
| 916 | 904 | local t = font_getfont(fnum) |
| 917 | 905 | if t.specification and t.resources then |
| 918 | 906 | local add_vert = not ltju.exist_feature(fnum, 'vert') and not ltju.exist_feature(fnum, 'vrt2') |
| 919 | - local jpotf_vert = t.shared.features.jpotf | |
| 907 | + local jpotf_vert = ltju.specified_feature(fnum, 'jpotf') | |
| 920 | 908 | -- 現在の language, script で vert もvrt2 も有効にできない場合，強制的に vert 適用 |
| 921 | 909 | for _,i in pairs(t.resources.sequences) do |
| 922 | 910 | if i.order[1]== 'vert' and i.type == 'gsub_single' and i.steps then |
| @@ -972,18 +960,8 @@ do | ||
| 972 | 960 | local ensure_tex_attr = ltjb.ensure_tex_attr |
| 973 | 961 | local node_write = node.direct.write |
| 974 | 962 | local font = font |
| 975 | - local new_ic_kern | |
| 963 | + local new_ic_kern = function(g) return node_new(id_kern,3) end | |
| 976 | 964 | local dir_tate = luatexja.dir_table.dir_tate |
| 977 | - if status.luatex_version>=89 then | |
| 978 | - new_ic_kern = function(g) return node_new(id_kern,3) end | |
| 979 | - else | |
| 980 | - local ITALIC = luatexja.icflag_table.ITALIC | |
| 981 | - new_ic_kern = function() | |
| 982 | - local g = node_new(id_kern, 1) | |
| 983 | - set_attr(g, attr_icflag, ITALIC) | |
| 984 | - return g | |
| 985 | - end | |
| 986 | - end | |
| 987 | 965 | -- EXT: italic correction |
| 988 | 966 | function luatexja.jfont.append_italic() |
| 989 | 967 | local p = to_direct(tex.nest[tex.nest.ptr].tail) |
| @@ -6,7 +6,12 @@ | ||
| 6 | 6 | local aux = {} |
| 7 | 7 | luatexja.lotf_aux = aux |
| 8 | 8 | |
| 9 | -local getfont = font.getfont | |
| 9 | +local getfont | |
| 10 | +do | |
| 11 | + local font_getfont = font.getfont | |
| 12 | + getfont = function (id) return (type(id)=="table") and id or font_getfont(id) end | |
| 13 | +end | |
| 14 | + -- accept font number or table | |
| 10 | 15 | local provides_feature = luaotfload.aux.provides_feature |
| 11 | 16 | function aux.exist_feature(id, name) |
| 12 | 17 | local t = getfont(id) |
| @@ -38,7 +43,7 @@ end | ||
| 38 | 43 | aux.get_ascender, aux.get_descender = get_ascender, get_descender |
| 39 | 44 | |
| 40 | 45 | function aux.get_vheight(id, c) -- scaled points |
| 41 | - local t = getfont(id) | |
| 46 | + local t = getfont(id) | |
| 42 | 47 | if t and t.descriptions and t.descriptions[c] and t.descriptions[c].vheight then |
| 43 | 48 | return t.descriptions[c].vheight / t.units * t.size |
| 44 | 49 | elseif t and t.shared and t.shared.rawdata and t.shared.rawdata.metadata then |
| @@ -48,17 +53,22 @@ function aux.get_vheight(id, c) -- scaled points | ||
| 48 | 53 | end |
| 49 | 54 | end |
| 50 | 55 | |
| 51 | -function aux.replace_vert_variant(id, c) | |
| 56 | +local function loop_over_feat(id, feature_name, func) | |
| 57 | +-- feature_name: like { vert=true, vrt2 = true, ...} | |
| 58 | +-- func: return non-nil iff abort this fn | |
| 52 | 59 | local t = getfont(id) |
| 53 | 60 | if t and t.resources and t.resources.sequences then |
| 54 | 61 | for _,i in pairs(t.resources.sequences) do |
| 55 | - if (i.order[1]=='vert' or i.order[1]=='vrt2') | |
| 56 | - and i.type == 'gsub_single' and i.steps then | |
| 57 | - for _,j in pairs(i.steps) do | |
| 58 | - if type(j)=='table' then | |
| 59 | - if type(j.coverage)=='table' then | |
| 60 | - for i,k in pairs(j.coverage) do | |
| 61 | - if i==c then return k end | |
| 62 | + if i.order[1] and feature_name[i.order[1]] then | |
| 63 | + local f = i.features and i.features[i.order[1]] | |
| 64 | + if i.type == 'gsub_single' and i.steps | |
| 65 | + and f and f[t.properties.script] and f[t.properties.script][t.properties.language] then | |
| 66 | + for _,j in pairs(i.steps) do | |
| 67 | + if type(j)=='table' then | |
| 68 | + if type(j.coverage)=='table' then | |
| 69 | + for i,k in pairs(j.coverage) do | |
| 70 | + local s = func(i,k); if s then return s end | |
| 71 | + end | |
| 62 | 72 | end |
| 63 | 73 | end |
| 64 | 74 | end |
| @@ -66,7 +76,14 @@ function aux.replace_vert_variant(id, c) | ||
| 66 | 76 | end |
| 67 | 77 | end |
| 68 | 78 | end |
| 69 | - return c | |
| 79 | +end | |
| 80 | +aux.loop_over_feat = loop_over_feat | |
| 81 | + | |
| 82 | +local vert_vrt2 = { vert=true, vrt2=true } | |
| 83 | +function aux.replace_vert_variant(id, c) | |
| 84 | + return loop_over_feat(id, vert_vrt2, | |
| 85 | + function (i,k) if i==c then return k end end) | |
| 86 | + or c | |
| 70 | 87 | end |
| 71 | 88 | |
| 72 | 89 |
| @@ -100,6 +100,7 @@ load_module('rmlgbm'); local ltjr = luatexja.rmlgbm -- must be 1st | ||
| 100 | 100 | |
| 101 | 101 | if luatexja_debug then load_module('debug') end |
| 102 | 102 | |
| 103 | +load_module('lotf_aux'); local ltju = luatexja.lotf_aux | |
| 103 | 104 | load_module('charrange'); local ltjc = luatexja.charrange |
| 104 | 105 | load_module('stack'); local ltjs = luatexja.stack |
| 105 | 106 | load_module('direction'); local ltjd = luatexja.direction -- +1 hlist +1 attr_list |
Fork