jlreq (27nov22)

git-svn-id: svn://tug.org/texlive/trunk@65119 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 698 insertions, 0 deletions

diff --git a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
index 6172b1b463d..e2a2e0a68dc 100644
--- a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
+++ b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
@@ -695,6 +695,14 @@ local jfm = {
 		]]
 		},
 	},
+
+	[161] = { -- 半角カナ
+      chars = {'ｦ', 'ｧ', 'ｨ', 'ｩ', 'ｪ', 'ｫ', 'ｬ', 'ｭ', 'ｮ', 'ｯ', 'ｰ', 'ｱ', 'ｲ', 'ｳ', 'ｴ', 'ｵ', 'ｶ', 'ｷ', 'ｸ', 'ｹ', 'ｺ', 'ｻ', 'ｼ', 'ｽ', 'ｾ', 'ｿ', 'ﾀ', 'ﾁ', 'ﾂ', 'ﾃ', 'ﾄ', 'ﾅ', 'ﾆ', 'ﾇ', 'ﾈ', 'ﾉ', 'ﾊ', 'ﾋ', 'ﾌ', 'ﾍ', 'ﾎ', 'ﾏ', 'ﾐ', 'ﾑ', 'ﾒ', 'ﾓ', 'ﾔ', 'ﾕ', 'ﾖ', 'ﾗ', 'ﾘ', 'ﾙ', 'ﾚ', 'ﾛ', 'ﾜ', 'ﾝ'},
+		width = 0.5, height = 0.88, depth = 0.12,
+		align = 'left',
+		glue = {} -- あとで
+	},
+
 	
 	--[[
 	[17] = { -- 等号類
@@ -750,6 +758,30 @@ local jfm = {
 		]]
 		},
 	},
+	[191] = { -- 1/2数字，よくわからないので漢字等と同じ扱いにする
+		left = 0,
+		chars = {"AJ1-247","AJ1-248","AJ1-249","AJ1-250","AJ1-251","AJ1-252","AJ1-253","AJ1-254","AJ1-255","AJ1-256"},
+		align = 'left',
+		width = 0.5,height = 0.88,depth = 0.12,
+		glue = { -- あとで処理
+		},
+	},
+	[192] = { -- 1/3数字，同様
+		left = 0,
+		chars = {"AJ1-9758","AJ1-9759","AJ1-9760","AJ1-9761","AJ1-9762","AJ1-9763","AJ1-9764","AJ1-9765","AJ1-9766","AJ1-9767"},
+		align = 'left',
+		width = 1/3,height = 0.88,depth = 0.12,
+		glue = { -- あとで処理
+		},
+	},
+	[193] = { -- 1/4数字，同様
+		left = 0,
+		chars = {"AJ1-9738","AJ1-9739","AJ1-9740","AJ1-9741","AJ1-9742","AJ1-9743","AJ1-9744","AJ1-9745","AJ1-9746","AJ1-9747"},
+		align = 'left',
+		width = 1/4,height = 0.88,depth = 0.12,
+		glue = { -- あとで処理
+		},
+	},
 
 	
 	--[[
@@ -1191,5 +1223,21 @@ if jlreq ~= nil then
 	end
 end
 
+local function copy_jfm(from,to)
+	if jfm[from].glue ~= nil then jfm[to].glue = table.fastcopy(jfm[from].glue) end
+	for tc,_ in pairs(jfm) do
+		if type(tc) == "number" then
+			if jfm[tc].glue[from] ~= nil then
+				jfm[tc].glue[to] = table.fastcopy(jfm[tc].glue[from])
+			end
+		end
+	end
+end
+
+copy_jfm(0,191)
+copy_jfm(0,192)
+copy_jfm(0,193)
+copy_jfm(16,161)
+
 
 luatexja.jfont.define_jfm(jfm)
diff --git a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua
index 5e17344a9e8..c9087f14371 100644
--- a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua
+++ b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua
@@ -181,6 +181,30 @@ local jfm={
     0,
     ["kanjiskip_natural"]=1,
    },
+   [161]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [191]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [192]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [193]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
    [300]={
     0,
     0,
@@ -338,6 +362,38 @@ local jfm={
     ["priority"]={ -1, -2 },
     ["ratio"]=0,
    },
+   [161]={
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=0,
+   },
+   [191]={
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=0,
+   },
+   [192]={
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=0,
+   },
+   [193]={
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=0,
+   },
    [300]={
     0.5,
     0,
@@ -478,6 +534,34 @@ local jfm={
     ["kanjiskip_natural"]=1,
     ["priority"]={ -1, 0 },
    },
+   [161]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [191]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [192]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [193]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
    [300]={
     0,
     0,
@@ -642,6 +726,38 @@ local jfm={
     ["priority"]={ -1, -1 },
     ["ratio"]=0,
    },
+   [161]={
+    0.25,
+    0.25,
+    0.25,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -1 },
+    ["ratio"]=0,
+   },
+   [191]={
+    0.25,
+    0.25,
+    0.25,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -1 },
+    ["ratio"]=0,
+   },
+   [192]={
+    0.25,
+    0.25,
+    0.25,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -1 },
+    ["ratio"]=0,
+   },
+   [193]={
+    0.25,
+    0.25,
+    0.25,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -1 },
+    ["ratio"]=0,
+   },
    [300]={
     0.25,
     0,
@@ -802,6 +918,38 @@ local jfm={
     ["priority"]={ -1, 0 },
     ["ratio"]=0,
    },
+   [161]={
+    0.5,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+    ["ratio"]=0,
+   },
+   [191]={
+    0.5,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+    ["ratio"]=0,
+   },
+   [192]={
+    0.5,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+    ["ratio"]=0,
+   },
+   [193]={
+    0.5,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+    ["ratio"]=0,
+   },
    [300]={
     0.5,
     0,
@@ -963,6 +1111,38 @@ local jfm={
     ["priority"]={ -1, -2 },
     ["ratio"]=0,
    },
+   [161]={
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=0,
+   },
+   [191]={
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=0,
+   },
+   [192]={
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=0,
+   },
+   [193]={
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=0,
+   },
    [300]={
     0.5,
     0,
@@ -1057,6 +1237,27 @@ local jfm={
     ["kanjiskip_natural"]=1,
     ["priority"]={ 0, 0 },
    },
+   [191]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, 0 },
+   },
+   [192]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, 0 },
+   },
+   [193]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, 0 },
+   },
    [300]={
     0,
     0,
@@ -1384,6 +1585,27 @@ local jfm={
     ["kanjiskip_natural"]=1,
     ["priority"]={ 0, 0 },
    },
+   [191]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, 0 },
+   },
+   [192]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, 0 },
+   },
+   [193]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, 0 },
+   },
    [300]={
     0,
     0,
@@ -1471,6 +1693,27 @@ local jfm={
     ["kanjiskip_natural"]=1,
     ["priority"]={ 0, 0 },
    },
+   [191]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, 0 },
+   },
+   [192]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, 0 },
+   },
+   [193]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, 0 },
+   },
    [300]={
     0,
     0,
@@ -1610,6 +1853,34 @@ local jfm={
     ["kanjiskip_natural"]=1,
     ["priority"]={ -1, 0 },
    },
+   [161]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [191]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [192]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [193]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
    [300]={
     0,
     0,
@@ -1875,6 +2146,301 @@ local jfm={
   },
   ["height"]=0.5,
  },
+ [161]={
+  ["align"]="left",
+  ["chars"]={ "ｦ", "ｧ", "ｨ", "ｩ", "ｪ", "ｫ", "ｬ", "ｭ", "ｮ", "ｯ", "ｰ", "ｱ", "ｲ", "ｳ", "ｴ", "ｵ", "ｶ", "ｷ", "ｸ", "ｹ", "ｺ", "ｻ", "ｼ", "ｽ", "ｾ", "ｿ", "ﾀ", "ﾁ", "ﾂ", "ﾃ", "ﾄ", "ﾅ", "ﾆ", "ﾇ", "ﾈ", "ﾉ", "ﾊ", "ﾋ", "ﾌ", "ﾍ", "ﾎ", "ﾏ", "ﾐ", "ﾑ", "ﾒ", "ﾓ", "ﾔ", "ﾕ", "ﾖ", "ﾗ", "ﾘ", "ﾙ", "ﾚ", "ﾛ", "ﾜ", "ﾝ" },
+  ["depth"]=0.5,
+  ["glue"]={
+   {
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=1,
+   },
+   {
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [4]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [5]={
+    0.25,
+    0,
+    0.25,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, -1 },
+    ["ratio"]=1,
+   },
+   [6]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [7]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [14]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [300]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [301]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [302]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+  },
+  ["height"]=0.5,
+  ["width"]=0.5,
+ },
+ [191]={
+  ["align"]="left",
+  ["chars"]={ "AJ1-247", "AJ1-248", "AJ1-249", "AJ1-250", "AJ1-251", "AJ1-252", "AJ1-253", "AJ1-254", "AJ1-255", "AJ1-256" },
+  ["depth"]=0.5,
+  ["glue"]={
+   {
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=1,
+   },
+   {
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [4]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [5]={
+    0.25,
+    0,
+    0.25,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, -1 },
+    ["ratio"]=1,
+   },
+   [6]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [7]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [14]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [300]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [301]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [302]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+  },
+  ["height"]=0.5,
+  ["left"]=0,
+  ["width"]=0.5,
+ },
+ [192]={
+  ["align"]="left",
+  ["chars"]={ "AJ1-9758", "AJ1-9759", "AJ1-9760", "AJ1-9761", "AJ1-9762", "AJ1-9763", "AJ1-9764", "AJ1-9765", "AJ1-9766", "AJ1-9767" },
+  ["depth"]=0.5,
+  ["glue"]={
+   {
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=1,
+   },
+   {
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [4]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [5]={
+    0.25,
+    0,
+    0.25,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, -1 },
+    ["ratio"]=1,
+   },
+   [6]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [7]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [14]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [300]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [301]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [302]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+  },
+  ["height"]=0.5,
+  ["left"]=0,
+  ["width"]=0.33333333333333,
+ },
+ [193]={
+  ["align"]="left",
+  ["chars"]={ "AJ1-9738", "AJ1-9739", "AJ1-9740", "AJ1-9741", "AJ1-9742", "AJ1-9743", "AJ1-9744", "AJ1-9745", "AJ1-9746", "AJ1-9747" },
+  ["depth"]=0.5,
+  ["glue"]={
+   {
+    0.5,
+    0.25,
+    0.5,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, -2 },
+    ["ratio"]=1,
+   },
+   {
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [4]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [5]={
+    0.25,
+    0,
+    0.25,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ 0, -1 },
+    ["ratio"]=1,
+   },
+   [6]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [7]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [14]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [300]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [301]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+   [302]={
+    0,
+    0,
+    0,
+    ["kanjiskip_natural"]=1,
+   },
+  },
+  ["height"]=0.5,
+  ["left"]=0,
+  ["width"]=0.25,
+ },
  [300]={
   ["align"]="middle",
   ["chars"]={ "‐" },
@@ -1994,6 +2560,34 @@ local jfm={
     ["kanjiskip_natural"]=1,
     ["priority"]={ -1, 0 },
    },
+   [161]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [191]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [192]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [193]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
    [300]={
     0,
     0,
@@ -2135,6 +2729,34 @@ local jfm={
     ["kanjiskip_natural"]=1,
     ["priority"]={ -1, 0 },
    },
+   [161]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [191]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [192]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [193]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
    [300]={
     0,
     0,
@@ -2276,6 +2898,34 @@ local jfm={
     ["kanjiskip_natural"]=1,
     ["priority"]={ -1, 0 },
    },
+   [161]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [191]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [192]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
+   [193]={
+    0,
+    0.25,
+    0,
+    ["kanjiskip_natural"]=1,
+    ["priority"]={ -1, 0 },
+   },
    [300]={
     0,
     0,