texlive[51584] Master/texmf-dist: luatexja (8jul19)
commits+karl at tug.org
commits+karl at tug.org
Mon Jul 8 23:28:00 CEST 2019
Revision: 51584
http://tug.org/svn/texlive?view=revision&revision=51584
Author: karl
Date: 2019-07-08 23:27:59 +0200 (Mon, 08 Jul 2019)
Log Message:
-----------
luatexja (8jul19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/luatexja/README
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
trunk/Master/texmf-dist/source/luatex/luatexja/tool/function_uax50.lua
trunk/Master/texmf-dist/source/luatex/luatexja/tool/ivslist.tex
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2019-07-08 21:27:59 UTC (rev 51584)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20190504.0
+The LuaTeX-ja Package 20190708.0
--------------------------------
Copyright (c) 2011--2019 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -40,9 +40,9 @@
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20190504.0 in the Git repository by
+ or tagged as 20190708.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20190504.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20190708.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -87,4 +87,4 @@
* src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
-Last commit date: Sat May 4 18:31:06 2019 +0900
+Last commit date: Mon Jul 8 15:23:01 2019 +0900
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2019-07-08 21:27:59 UTC (rev 51584)
@@ -1818,7 +1818,7 @@
これらは以下のデータに基づいて決定している．
%</ja>
\begin{itemize}
-%<en>\item Blocks in Unicode~11.0.
+%<en>\item Blocks in Unicode~12.0.0.
%<ja>\item Unicode~11.0のブロック．
%<en>\item The \texttt{Adobe-Japan1-UCS2} mapping between a CID Adobe-Japan1-6 and Unicode.
%<ja>\item Adobe-Japan1-6のCIDとUnicodeの間の対応表\texttt{Adobe-Japan1-UCS2}．
@@ -6937,6 +6937,7 @@
「適切なグリフ」\footnote{%
特に縦組用グリフのCID番号を指定した場合は（LuaTeX-ja 20190504.0以降では若干改良されているが）
意図しない結果になる可能性が高い．
+ なお，バージョン20190708.0以降では，CIDからグリフへの選択にグリフ名の情報を使用していない．
また，フォントにIVDコレクションAdobe-Japan1が含まれていれば，その情報を用いて
グリフを選択する．
}を出力する．
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/tool/function_uax50.lua
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/tool/function_uax50.lua 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/tool/function_uax50.lua 2019-07-08 21:27:59 UTC (rev 51584)
@@ -3,7 +3,7 @@
local function toX(a) return string.format('0x%X',a) end
-local uax_revision = '10.0.0'
+local uax_revision = '12.1.0'
print(' -- UAX#50 for Unicode ' .. uax_revision)
local fh = io.open('VerticalOrientation-' .. uax_revision .. '.txt')
local t = {}
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/tool/ivslist.tex
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/tool/ivslist.tex 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/tool/ivslist.tex 2019-07-08 21:27:59 UTC (rev 51584)
@@ -29,52 +29,29 @@
\baselineskip18pt
\begin{luacode}
-local fl = fontloader.open(ident.filename)
-local ft = fontloader.to_table(fl)
-
+local t = ident.shared.rawdata
+t = t and t.resources
+t = t and t.variants
local ivs, ivsi = {}, {}
-local uniq_flag
-local function add_ivs_table(tg)
- for gu, gv in pairs(tg) do
- local ga = gv.altuni
- if ga then
- for _,at in pairs(ga) do
- local bu, vs = at.unicode, (at.variant or 0)-0xE0100
- if vs>=0 and vs<0xF0 then
- if not ivs[bu] then ivs[bu] = {}; ivsi[1+#ivsi]=bu end
- uniq_flag = true
- for _,v in pairs(ivs[bu]) do
- if v[1]==vs then uniq_flag = false; break end
- end
- if uniq_flag then ivs[bu][1+#(ivs[bu])] = { vs, gv.name } end
- end
- end
- end
- end
+for i,v in pairs(t) do
+ if i>=0xE0100 then
+ for j,w in pairs(v) do
+ if not ivs[j] then table.insert(ivsi,j); ivs[j]=ivs[j] or {}; end
+ table.insert(ivs[j],{i-0xE0100,w})
+ end
+ end
end
-
-add_ivs_table(ft.glyphs)
-if ft.subfonts then
- for _,v in pairs(ft.subfonts) do
- add_ivs_table(v.glyphs)
- end
-end
-fontloader.close(fl)
-
-local unicodes = ident.resources.unicodes
local sort = table.sort
local sortfn = function (a,b) return a[1]<b[1] end
sort(ivsi)
-for _,v in pairs(ivsi) do
- sort(ivs[v], sortfn)
+for _,v in pairs(ivsi) do
+ sort(ivs[v], sortfn)
tex.sprint('\\OUT{' .. string.format('%X', v) .. '}\\ ')
for _, cn in pairs(ivs[v]) do
- tex.sprint('\\FMT{' .. tostring(unicodes[cn[2]]) .. '}{' .. cn[1] .. '}' )
+ tex.sprint('\\FMT{' .. tostring(cn[2]) .. '}{' .. cn[1] .. '}' )
end
tex.sprint('\\par')
end
-
-
\end{luacode}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty 2019-07-08 21:27:59 UTC (rev 51584)
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-25c}[2019/01/28 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-25c}[2019/05/14 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
@@ -11,8 +11,8 @@
\cs_new:Npn \ltj_fontspec_match_cmd {
\renewcommand\jttdefault{\gtdefault}
\@ltj at match@familytrue
- \DeclareDocumentCommand \setmonojfont { O{} m } {
- \ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2}
+ \DeclareDocumentCommand \setmonojfont { O{} m O{} } {
+ \ltj_fontspec_set_family:Nnn \jttdefault {##1,##3}{##2}
\normalfont
}
}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty 2019-07-08 21:27:59 UTC (rev 51584)
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-26h}[2019/01/28 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-26h}[2019/05/14 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
@@ -11,8 +11,8 @@
\cs_new:Npn \__ltj_fontspec_match_cmd {
\renewcommand\jttdefault{\gtdefault}
\@ltj at match@familytrue
- \DeclareDocumentCommand \setmonojfont { O{} m } {
- \__ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2}
+ \DeclareDocumentCommand \setmonojfont { O{} m O{} } {
+ \__ltj_fontspec_set_family:Nnn \jttdefault {##1,##3}{##2}
\normalfont
}
}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty 2019-07-08 21:27:59 UTC (rev 51584)
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-27c}[2019/03/20 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-27c}[2019/05/14 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
@@ -11,8 +11,8 @@
\cs_new:Npn \__ltj_fontspec_match_cmd {
\renewcommand\jttdefault{\gtdefault}
\@ltj at match@familytrue
- \DeclareDocumentCommand \setmonojfont { O{} m } {
- \__ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2}
+ \DeclareDocumentCommand \setmonojfont { O{} m O{} } {
+ \__ltj_fontspec_set_family:Nnn \jttdefault {##1,##3}{##2}
\normalfont
}
}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua 2019-07-08 21:27:59 UTC (rev 51584)
@@ -3,7 +3,7 @@
--
luatexbase.provides_module({
name = 'luatexja.jfont',
- date = '2019/05/01',
+ date = '2019/07/08',
description = 'Loader for Japanese fonts',
})
@@ -756,9 +756,9 @@
local list_rotate_glyphs
do
-- output of function_uax50.lua
- -- UAX#50 for Unicode 11.0.0
+ -- UAX#50 for Unicode 12.1.0
-- t[0] = true
- 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, 3192, 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, 3719, 3721, 3722, 3723, 3725, 3726, 3732, 3736, 3737, 3744, 3745, 3748, 3749, 3750, 3751, 3752, 3754, 3756, 3757, 3770, 3771, 3774, 3776, 3781, 3782, 3783, 3784, 3790, 3792, 3802, 3804, 3808, 3840, 3912, 391!
3, 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, 7418, 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, 11855, 12296, 12306, 12308, 12320, 12336, 12337, 12448, 12449, 12540, 12541, 42192, 42540, 42560, 42744, 42752, 42938, 42!
999, 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, 43878, 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, 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, 70751, 70784, 70856, 70864, 70874, 71168, 71237, 71248, 71258, 71264, 71277, 71296, 71352, 71360, 71370, 71424, 71451, 71453, 71468, 71472, 71488, 71680, 71740, 71840, 71923, 71935, 71936, 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, 73728, 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, 94021, 94032, 94079, 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, 124928, 125125, 125127, 125143, 125184, 125259, 125264, 125274, 125278, 125280, 126065, 126133, 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 }
+ 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, 430!
1, 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, 43!
232, 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 }
local function rotate_in_uax50(i)
local lo, hi = 1, #t
while lo < hi do
@@ -796,8 +796,8 @@
for i,_ in pairs(rot) do
dest = dest or {}
- dest[i] = dest[i] or {}
- dest[i].rotation = true
+ dest.rotation = dest.rotation or {}
+ dest.rotation[i] = true
end
end
return dest
@@ -806,151 +806,21 @@
-- vertical metrics
local prepare_fl_data
-local supply_vkern_table
do
- local fields = fontloader.fields
- local function glyph_vmetric(glyph)
- local flds = fields(glyph)
- local vw, tsb, vk = nil, nil, nil
- for _,i in ipairs(flds) do
- if i=='vwidth' then vw = glyph.vwidth end
- if i=='tsidebearing' then tsb = glyph.tsidebearing end
- if i=='vkerns' then vk = glyph.vkerns end
- end
- return vw, tsb, vk
- end
-
local sort = table.sort
- local function add_fl_table(dest, glyphs, unitable, asc_des, units, id)
- local glyphmin, glyphmax = glyphs.glyphmin, glyphs.glyphmax
- if glyphmax < 0 then return dest end
- local tg = glyphs.glyphs
- for i = glyphmin, glyphmax do
- local gv = tg[i]
- if gv then
- if gv.altuni then
- for _,at in pairs(gv.altuni) do
- local bu, vsel = at.unicode, at.variant
- if vsel then
- if vsel>=0xE0100 then vsel = vsel - 0xE0100 end
- local uniq_flag = true
- if dest and dest[bu] then
- for i,_ in pairs(dest[bu]) do
- if i==vsel then uniq_flag = false; break end
- end
- end
- if uniq_flag then
- dest = dest or {}; dest[bu] = dest[bu] or {}
- dest[bu][vsel] = unitable[gv.name]
- end
- end
- end
- end
- -- vertical metric
- local vw, tsb, vk = glyph_vmetric(gv)
- local gi = unitable[gv.name]
- if gi and vw and vw~=asc_des then
- -- We do not use tsidebearing, since (1) fontloader does not read VORG table
- -- and (2) 'tsidebearing' doea not appear in the returned table by fontloader.fields.
- -- Hence, we assume that vertical origin == ascender
- -- (see capsule_glyph_tate in ltj-setwidth.lua)
- dest = dest or {}; dest[gi] = dest[gi] or {}
- dest[gi].vwidth = vw/units
- end
- -- vertical kern
- if gi and vk then
- dest = dest or {};
- local dest_vk = dest.vkerns or {}; dest.vkerns = dest_vk
- for _,v in pairs(vk) do
- if unitable[v.char] then
- local vl = v.lookup
- if type(vl)=='table' then
- for _,vlt in pairs(vl) do
- dest_vk[vlt] = dest_vk[vlt] or {}
- dest_vk[vlt][gi] = dest_vk[vlt][gi] or {}
- dest_vk[vlt][gi][unitable[v.char]] = v.off
- end
- else
- dest_vk[vl] = dest_vk[vl] or {}
- dest_vk[vl][gi] = dest_vk[vl][gi] or {}
- dest_vk[vl][gi][unitable[v.char]] = v.off
- end
- end
- end
- end
- end
- end
- return dest
- end
prepare_fl_data = function (dest, id)
- local t = fontloader.info(id.filename)
- if not t then return dest end
- local fl
- if t.fontname then
- fl = fontloader.open(id.filename)
- else
- fl = fontloader.open(id.filename, id.fontname) -- マニュアルにはこっちで書いてあるが？
- if not fl then
- local index
- for i,v in ipairs(t) do
- if v.fontname == id.fontname then index=i; break end
- end
- fl = fontloader.open(id.filename, index)
- end
- end
- if not fl then fontloader.close(fl); return dest end
- local ind_to_uni, unicodes = {}, {}
- for i,v in pairs(id.characters) do
- ind_to_uni[v.index] = i
- end
- if fl.glyphs then
- local tg, glyphmin, glyphmax = fl.glyphs, fl.glyphmin, fl.glyphmax
- if 0 <= glyphmax then
- for i = glyphmin, glyphmax do
- if tg[i] and tg[i].name then unicodes[tg[i].name] = ind_to_uni[i] end
- end
- end
- dest = add_fl_table(dest, fl, unicodes,
- fl.ascent + fl.descent, fl.units_per_em, id)
- end
- if fl.subfonts then
- for _,v in pairs(fl.subfonts) do
- local tg, glyphmin, glyphmax = v.glyphs, v.glyphmin, v.glyphmax
- if 0 <= glyphmax then
- for i = glyphmin, glyphmax do
- if tg[i] and tg[i].name then unicodes[tg[i].name] = ind_to_uni[i] end
- end
- end
- end
- for _,v in pairs(fl.subfonts) do
- dest = add_fl_table(dest, v, unicodes,
- fl.ascent + fl.descent, fl.units_per_em, id)
- end
+ local t = {}
+ for i,v in pairs(id.shared.rawdata.descriptions) do
+ t[v.index] = i
end
- if dest then dest.unicodes = unicodes end
- fontloader.close(fl); collectgarbage("collect")
+ dest = dest or {}; dest.ind_to_uni = t
return dest
end
- -- supply vkern table
- supply_vkern_table = function(id, bname)
- local bx = font_extra_basename[bname].vkerns
- local lookuphash = id.resources.lookuphash
- local desc = id.shared.rawdata.descriptions
- if bx and lookuphash then
- for i,v in pairs(bx) do
- lookuphash[i] = lookuphash[i] or v
- for j,w in pairs(v) do
- desc[j].kerns = desc[j].kerns or {}
- desc[j].kerns[i] = w
- end
- end
- end
- end
end
--
do
- local cache_ver = 16
+ local cache_ver = 18
local function prepare_extra_data_base(id)
if (not id) or (not id.filename) then return end
@@ -990,12 +860,8 @@
luatexbase.add_to_callback(
'luaotfload.patch_font',
function (tfmdata)
- -- these function is executed one time per one fontfile
- if jfm_file_name then
- local bname = prepare_extra_data_base(tfmdata)
- if bname then supply_vkern_table(tfmdata, bname) end
- end
- return tfmdata
+ -- these function is executed one time per one fontfile
+ prepare_extra_data_base(tfmdata); return tfmdata
end,
'ltj.prepare_extra_data', 1)
luatexbase.add_to_callback(
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua 2019-07-08 21:27:59 UTC (rev 51584)
@@ -69,8 +69,8 @@
local function get_ucs_from_rmlgbm(c)
local v = (ivd_aj1 and ivd_aj1.table_ivd_aj1[c]
- or ltjr_cidfont_data["Adobe-Japan1"].resources.unicodes["Japan1." .. tostring(c)])
- or 0
+ or ltjr_cidfont_data["Adobe-Japan1"].resources.unicodes["Japan1." .. tostring(c)])
+ or 0
if v>=0x200000 then -- table
local curjfnt_num = tex_get_attr((ltjd_get_dir_count()==dir_tate)
and attr_curtfnt or attr_curjfnt)
@@ -185,20 +185,17 @@
-- 'Current Japanese font (or other CJK font) "'
-- ..curjfnt.psname..'" is not a CID-Keyed font (Adobe-Japan1 etc.)')
return append_jglyph(get_ucs_from_rmlgbm(key))
- end
- local fe, char = ltjf_font_extra_info[curjfnt_num], nil
- if fe and fe.unicodes then
- char = fe.unicodes[cidinfo.ordering..'.'..tostring(key)]
- end
- if not char then
- ltjb.package_warning('luatexja-otf',
- 'Current Japanese font (or other CJK font) "'
- ..curjfnt.psname..'" does not have the specified CID character ('
- ..tostring(key)..')',
- 'Use a font including the specified CID character.')
+ else
+ local char = ltjf_font_extra_info[curjfnt_num].ind_to_uni[key]
+ if not char then
+-- ltjb.package_warning('luatexja-otf',
+-- '"' ..curjfnt.psname..'" does not have CID character '
+-- ..tostring(key),
+-- 'Use a font including the specified CID character.')
char = 0
+ end
+ return append_jglyph(char)
end
- return append_jglyph(char)
end
end
@@ -243,19 +240,17 @@
-- additional callbacks
-- 以下は，LuaTeX-ja に用意された callback のサンプルになっている．
-- JFM の文字クラスの指定の所で，"AJ1-xxx" 形式での指定を可能とした．
--- これらの文字指定は，和文フォント定義ごとに，それぞれのフォントの
--- CID <-> グリフ 対応状況による変換テーブルが用意される．
--- 和文フォント読み込み時に，CID -> unicode 対応をとっておく．
-local function cid_to_char(fmtable, fn)
+-- 和文フォント読み込み時に，ind -> unicode 対応をとっておく．
+local function ind_to_uni(fmtable, fn)
local fi = identifiers[fn]
- local fe = ltjf_font_extra_info[fn]
- if (fi.resources and fi.resources.cidinfo and fi.resources.cidinfo.ordering == "Japan1" )
- and (fe and fe.unicodes) then
+ local t = ltjf_font_extra_info[fn].ind_to_uni
+ if t and fi.resources and fi.resources.cidinfo
+ and fi.resources.cidinfo.ordering == "Japan1" then
for i, v in pairs(fmtable.chars) do
local j = string.match(i, "^AJ1%-([0-9]*)")
if j then
- j = tonumber(fe.unicodes['Japan1.'..tostring(j)])
+ j = t[i]
if j then
fmtable.cid_char_type = fmtable.cid_char_type or {}
fmtable.cid_char_type[j] = v
@@ -266,10 +261,10 @@
return fmtable
end
luatexbase.add_to_callback("luatexja.define_jfont",
- cid_to_char, "ltj.otf.define_jfont", 1)
+ ind_to_uni, "ltj.otf.define_jfont", 1)
-- 既に読み込まれているフォントに対しても，同じことをやらないといけない
for fn, v in pairs(ltjf_font_metric_table) do
- ltjf_font_metric_table[fn] = cid_to_char(v, fn)
+ ltjf_font_metric_table[fn] = ind_to_uni(v, fn)
end
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua 2019-07-08 21:27:59 UTC (rev 51584)
@@ -43,7 +43,6 @@
local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
local ltjs_orig_char_table = ltjs.orig_char_table
local ltjf_replace_altfont = ltjf.replace_altfont
---local ltjf_font_extra_info = ltjf.font_extra_info
local attr_orig_char = luatexbase.attributes['ltj at origchar']
local STCK = luatexja.userid_table.STCK
local DIR = luatexja.userid_table.DIR
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua 2019-07-08 21:27:59 UTC (rev 51584)
@@ -177,13 +177,17 @@
do
local pf = getfont(p)
local pc = getchar(p)
- local cei = ltjf_font_extra_info[pf] and ltjf_font_extra_info[pf][pc]
- if cei and met.vert_activated then
- if cei.rotation then
+ local feir = ltjf_font_extra_info[pf]
+ if feir and feir.rotation and met.vert_activated then
+ if feir.rotation[pc] then
return capsule_glyph_tate_rot(p, met, char_data, head, dir, 0.5*(ascent-descent))
end
end
- pwidth = (cei and cei.vwidth) and cei.vwidth * met.size or (ascent+descent)
+ local ident = fonts.hashes.identifiers[pf]
+ pwidth = (ident.descriptions and ident.descriptions[pc]
+ and ident.descriptions[pc].vheight
+ and ident.descriptions[pc].vheight / ident.units * met.size)
+ or (ascent+descent)
pwidth = pwidth + (met.v_advance[pc] or 0)
ascent = met.v_origin[pc] and ascent - met.v_origin[pc] or ascent
end
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua 2019-07-08 21:27:59 UTC (rev 51584)
@@ -1,5 +1,5 @@
-- Do not edit this file!
--- Created from LineBreak.txt by ltj-unicode-ccfix_make.pl on 2019年 2月 11日 月曜日 06:40:10 JST.
+-- Created from LineBreak.txt by ltj-unicode-ccfix_make.pl on 2019年 7月 8日 月曜日 06:15:17 JST.
-- In case of errors, fix the Perl script instead.
local tex_catcode = tex.setcatcode
local tex_getcc = tex.getcatcode
@@ -89,7 +89,7 @@
set_letter(0x3280,0x3289)
set_letter(0x328A,0x32B0)
set_letter(0x32B1,0x32BF)
-set_letter(0x32C0,0x32FE)
+set_letter(0x32C0,0x32FF)
set_letter(0x3300,0x33FF)
set_letter(0x3400,0x4DB5)
set_letter(0x4DB6,0x4DBF)
@@ -143,7 +143,7 @@
set_letter(0xFFE2,0xFFE2)
set_letter(0xFFE3,0xFFE3)
set_letter(0xFFE4,0xFFE4)
-set_letter(0x17000,0x187F1)
+set_letter(0x17000,0x187F7)
set_letter(0x18800,0x18AF2)
set_letter(0x1B000,0x1B0FF)
set_letter(0x1B100,0x1B11E)
@@ -161,7 +161,7 @@
set_letter(0x1F0D1,0x1F0F5)
set_letter(0x1F0F6,0x1F0FF)
set_letter(0x1F10D,0x1F10F)
-set_letter(0x1F16C,0x1F16F)
+set_letter(0x1F16D,0x1F16F)
set_letter(0x1F1AD,0x1F1E5)
set_letter(0x1F200,0x1F202)
set_letter(0x1F203,0x1F20F)
@@ -184,12 +184,12 @@
set_letter(0x1F400,0x1F441)
set_letter(0x1F444,0x1F445)
set_letter(0x1F451,0x1F465)
-set_letter(0x1F46A,0x1F46D)
-set_letter(0x1F46F,0x1F46F)
set_letter(0x1F479,0x1F47B)
set_letter(0x1F47D,0x1F480)
set_letter(0x1F484,0x1F484)
-set_letter(0x1F488,0x1F49F)
+set_letter(0x1F488,0x1F48E)
+set_letter(0x1F490,0x1F490)
+set_letter(0x1F492,0x1F49F)
set_letter(0x1F4A1,0x1F4A1)
set_letter(0x1F4A3,0x1F4A3)
set_letter(0x1F4A5,0x1F4A9)
@@ -211,46 +211,55 @@
set_letter(0x1F6A4,0x1F6B3)
set_letter(0x1F6B7,0x1F6BF)
set_letter(0x1F6C1,0x1F6CB)
-set_letter(0x1F6CD,0x1F6D4)
-set_letter(0x1F6D5,0x1F6DF)
+set_letter(0x1F6CD,0x1F6D5)
+set_letter(0x1F6D6,0x1F6DF)
set_letter(0x1F6E0,0x1F6EC)
set_letter(0x1F6ED,0x1F6EF)
-set_letter(0x1F6F0,0x1F6F9)
-set_letter(0x1F6FA,0x1F6FF)
+set_letter(0x1F6F0,0x1F6FA)
+set_letter(0x1F6FB,0x1F6FF)
set_letter(0x1F774,0x1F77F)
set_letter(0x1F7D5,0x1F7D8)
-set_letter(0x1F7D9,0x1F7FF)
+set_letter(0x1F7D9,0x1F7DF)
+set_letter(0x1F7E0,0x1F7EB)
+set_letter(0x1F7EC,0x1F7FF)
set_letter(0x1F80C,0x1F80F)
set_letter(0x1F848,0x1F84F)
set_letter(0x1F85A,0x1F85F)
set_letter(0x1F888,0x1F88F)
set_letter(0x1F8AE,0x1F8FF)
-set_letter(0x1F90C,0x1F90F)
+set_letter(0x1F90C,0x1F90C)
+set_letter(0x1F90D,0x1F90E)
set_letter(0x1F910,0x1F917)
-set_letter(0x1F91D,0x1F91D)
set_letter(0x1F920,0x1F925)
set_letter(0x1F927,0x1F92F)
-set_letter(0x1F93A,0x1F93C)
-set_letter(0x1F93F,0x1F93F)
-set_letter(0x1F940,0x1F970)
-set_letter(0x1F971,0x1F972)
+set_letter(0x1F93A,0x1F93B)
+set_letter(0x1F93F,0x1F971)
+set_letter(0x1F972,0x1F972)
set_letter(0x1F973,0x1F976)
set_letter(0x1F977,0x1F979)
-set_letter(0x1F97A,0x1F97A)
-set_letter(0x1F97B,0x1F97B)
-set_letter(0x1F97C,0x1F9A2)
-set_letter(0x1F9A3,0x1F9AF)
-set_letter(0x1F9B0,0x1F9B4)
+set_letter(0x1F97A,0x1F9A2)
+set_letter(0x1F9A3,0x1F9A4)
+set_letter(0x1F9A5,0x1F9AA)
+set_letter(0x1F9AB,0x1F9AD)
+set_letter(0x1F9AE,0x1F9B4)
set_letter(0x1F9B7,0x1F9B7)
-set_letter(0x1F9BA,0x1F9BF)
-set_letter(0x1F9C0,0x1F9C2)
-set_letter(0x1F9C3,0x1F9CF)
+set_letter(0x1F9BA,0x1F9BA)
+set_letter(0x1F9BC,0x1F9CA)
+set_letter(0x1F9CB,0x1F9CC)
set_letter(0x1F9D0,0x1F9D0)
set_letter(0x1F9DE,0x1F9FF)
-set_letter(0x1FA00,0x1FA5F)
+set_letter(0x1FA54,0x1FA5F)
set_letter(0x1FA60,0x1FA6D)
set_letter(0x1FA6E,0x1FA6F)
-set_letter(0x1FA70,0x1FFFD)
+set_letter(0x1FA70,0x1FA73)
+set_letter(0x1FA74,0x1FA77)
+set_letter(0x1FA78,0x1FA7A)
+set_letter(0x1FA7B,0x1FA7F)
+set_letter(0x1FA80,0x1FA82)
+set_letter(0x1FA83,0x1FA8F)
+set_letter(0x1FA90,0x1FA95)
+set_letter(0x1FA96,0x1FAFF)
+set_letter(0x1FB00,0x1FFFD)
set_letter(0x20000,0x2A6D6)
set_letter(0x2A6D7,0x2A6FF)
set_letter(0x2A700,0x2B734)
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2019-07-08 21:27:59 UTC (rev 51584)
@@ -41,7 +41,7 @@
\ProcessOptions\relax
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20190504.0}
+\def\LuaTeXjaversion{20190708.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty 2019-07-08 21:27:26 UTC (rev 51583)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty 2019-07-08 21:27:59 UTC (rev 51584)
@@ -1,5 +1,5 @@
%
-% lltjp-siunitx.sty 2018-11-02
+% lltjp-siunitx.sty 2019-06-06
%
\NeedsTeXFormat{LaTeX2e}
@@ -29,9 +29,25 @@
}
%%%% new table column: S and s
+\bool_new:N \l__ltj_siunitx_table_collect_relax_bool
+\cs_set_protected:Npn \__siunitx_table_collect_begin_s: {
+ \bool_set_false:N \l__ltj_siunitx_table_collect_relax_bool
+ \cs_set_eq:NN \__siunitx_table_collect_token:N
+ \__siunitx_table_collect_token_s:N
+ \cs_set_eq:NN \__siunitx_table_print: \__siunitx_table_print_s:
+ \__siunitx_table_collect_init_s:
+ \__siunitx_table_collect_get:
+}
+
\cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1
{
- \token_if_eq_meaning:NNF #1 \relax {
+ \token_if_eq_meaning:NNTF #1 \tex_relax:D {
+ \bool_if:NTF \l__ltj_siunitx_table_collect_relax_bool {
+ \__siunitx_table_collect_not_braced_aux_i:N #1
+ } {
+ \bool_set_true:N \l__ltj_siunitx_table_collect_relax_bool
+ }
+ } {
\token_if_eq_meaning:NNF #1 \ltjfakeboxbdd {
\token_if_eq_meaning:NNF #1 \pltx at next@inhibitglue {
\token_if_eq_meaning:NNF #1 \tex_ignorespaces:D
@@ -48,8 +64,14 @@
\@ifpackageloaded { mdwtab }
{
\cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1
- {
- \token_if_eq_meaning:NNF #1 \relax {
+ {
+ \token_if_eq_meaning:NNTF #1 \tex_relax:D {
+ \bool_if:NTF \l__ltj_siunitx_table_collect_relax_bool {
+ \__siunitx_table_collect_not_braced_aux_i:N #1
+ } {
+ \bool_set_true:N \l__ltj_siunitx_table_collect_relax_bool
+ }
+ } {
\token_if_eq_meaning:NNF #1 \ltjfakeboxbdd {
\token_if_eq_meaning:NNF #1 \pltx at next@inhibitglue {
\token_if_eq_meaning:NNF #1 \tex_ignorespaces:D
More information about the tex-live-commits
mailing list