From 5d6aa3bb897112068aa9d0576df5330ef881f8e3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 22 Jul 2021 20:39:40 +0000 Subject: jlreq (22jul21) git-svn-id: svn://tug.org/texlive/trunk@60015 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua | 716 ++++++------ Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua | 1254 ++++++++++++++++++--- 2 files changed, 1448 insertions(+), 522 deletions(-) (limited to 'Master/texmf-dist/tex/luatex') diff --git a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua index 4b84ffcedf1..6172b1b463d 100644 --- a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua +++ b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua @@ -15,26 +15,26 @@ xkanjiskipは{1,-3},kanjiskip={0,0} local stretch_width = 0.25 -- 空き第四段階の空き量 local hyphen_glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, - [9] = {0, 0, 0}, - [10] = {0, 0, 0}, - [11] = {0, 0, 0}, - [12] = {0, stretch_width, 0, priority = {-1,0}}, - [13] = {0, stretch_width, 0, priority = {-1,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, - [15] = {0, stretch_width, 0, priority = {-1,0}}, - [16] = {0, stretch_width, 0, priority = {-1,0}}, - [0] = {0, stretch_width, 0, priority = {-1,0}}, - [27] = {0, stretch_width, 0, priority = {-1,0}}, + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, + [8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [9] = {0, 0, 0, kanjiskip_natural = 1}, + [10] = {0, 0, 0, kanjiskip_natural = 1}, + [11] = {0, 0, 0, kanjiskip_natural = 1}, + [12] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [13] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [15] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [16] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [0] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [27] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0, 0, 0}, @@ -65,26 +65,26 @@ local jfm = { width = 0.5,height = 0.88,depth = 0.12, align = 'right', glue = { - [1] = {0, 0, 0}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0, 0}, - [9] = {0, 0, 0}, - [10] = {0, 0, 0}, - [11] = {0, 0, 0}, - [12] = {0, 0, 0}, - [13] = {0, 0, 0}, - [14] = {0, 0, 0}, - [15] = {0, 0, 0}, - [16] = {0, 0, 0}, - [0] = {0, 0, 0}, - [27] = {0, 0, 0}, + [1] = {0, 0, 0, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, + [8] = {0, 0, 0, kanjiskip_natural = 1}, + [9] = {0, 0, 0, kanjiskip_natural = 1}, + [10] = {0, 0, 0, kanjiskip_natural = 1}, + [11] = {0, 0, 0, kanjiskip_natural = 1}, + [12] = {0, 0, 0, kanjiskip_natural = 1}, + [13] = {0, 0, 0, kanjiskip_natural = 1}, + [14] = {0, 0, 0, kanjiskip_natural = 1}, + [15] = {0, 0, 0, kanjiskip_natural = 1}, + [16] = {0, 0, 0, kanjiskip_natural = 1}, + [0] = {0, 0, 0, kanjiskip_natural = 1}, + [27] = {0, 0, 0, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0, 0, 0}, @@ -107,26 +107,26 @@ local jfm = { width = 0.5,height = 0.88,depth = 0.12, align = 'left', glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, - [15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {0, 0, 0, kanjiskip_natural = 1}, + [300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, + [8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, @@ -170,26 +170,26 @@ local jfm = { width = 1,height = 0.88,depth = 0.12, align = 'middle', glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, stretch_width, 0.25, ratio = 1, priority = {-1,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, - [9] = {0, 0, 0}, - [10] = {0, 0, 0}, - [11] = {0, 0, 0}, - [12] = {0, stretch_width, 0, priority = {-1,0}}, - [13] = {0, stretch_width, 0, priority = {-1,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, - [15] = {0, stretch_width, 0, priority = {-1,0}}, - [16] = {0, stretch_width, 0, priority = {-1,0}}, - [0] = {0, stretch_width, 0, priority = {-1,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, stretch_width, 0.25, ratio = 1, priority = {-1,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, + [8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [9] = {0, 0, 0, kanjiskip_natural = 1}, + [10] = {0, 0, 0, kanjiskip_natural = 1}, + [11] = {0, 0, 0, kanjiskip_natural = 1}, + [12] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [13] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [15] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [16] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [0] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, @@ -212,26 +212,26 @@ local jfm = { width = 0.5,height = 0.88,depth = 0.12, align = 'middle', glue = { - [1] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [2] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [300] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [301] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [302] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [4] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [5] = {0.5, 0, 0.5, ratio = 0.5, priority = {0,-1}}, - [6] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [7] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [8] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [9] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [10] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [11] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [12] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [13] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [14] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [15] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [16] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [0] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [27] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, + [1] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1}, + [2] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1}, + [300] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1}, + [301] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1}, + [302] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1}, + [4] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1}, + [5] = {0.5, 0, 0.5, ratio = 0.5, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1}, + [7] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1}, + [8] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1}, + [9] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1}, + [10] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1}, + [11] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1}, + [12] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1}, + [13] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1}, + [14] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1}, + [15] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1}, + [16] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1}, + [0] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1}, + [27] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1}, --[[ [20] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, [21] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, @@ -254,26 +254,26 @@ local jfm = { width = 0.5,height = 0.88,depth = 0.12, align = 'left', glue = { - [1] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [2] = {0, 0, 0}, - [300] = {0.5, 0, 0, ratio = 0}, - [301] = {0.5, 0, 0, ratio = 0}, - [302] = {0.5, 0, 0, ratio = 0}, - [4] = {0.5, 0, 0, ratio = 0}, - [5] = {0.75, 0, 0.25, ratio = 0.33333333, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [9] = {0.5, 0, 0, ratio = 0}, - [10] = {0.5, 0, 0, ratio = 0}, - [11] = {0.5, 0, 0, ratio = 0}, - [12] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [13] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [14] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [15] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [16] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [0] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [27] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, + [1] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1}, + [2] = {0, 0, 0, kanjiskip_natural = 1}, + [300] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1}, + [301] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1}, + [302] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1}, + [4] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1}, + [5] = {0.75, 0, 0.25, ratio = 0.33333333, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, + [8] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1}, + [9] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1}, + [10] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1}, + [11] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1}, + [12] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1}, + [13] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1}, + [14] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1}, + [15] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1}, + [16] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1}, + [0] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1}, + [27] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0.5, 0, 0, ratio = 0}, @@ -296,26 +296,26 @@ local jfm = { width = 0.5,height = 0.88,depth = 0.12, align = 'left', glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [5] = {0.75, 0, 0.75, ratio = 0.33333333, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [14] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {0, 0, 0, kanjiskip_natural = 1}, + [300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [5] = {0.75, 0, 0.75, ratio = 0.33333333, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, + [8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1}, + [12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [14] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, + [27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, @@ -337,26 +337,26 @@ local jfm = { width = 1,height = 0.88,depth = 0.12, align = 'middle', glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, [8] = {0, 0, 0}, -- 空き注4 --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, - [0] = {0, 0.25, 0, priority = {0,0}}, - [27] = {0, 0.25, 0, priority = {0,0}}, +-- [9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [14] = {0, 0, 0, kanjiskip_natural = 1}, +-- [15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [27] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0, 0.25, 0, priority = {0,0}}, @@ -377,26 +377,26 @@ local jfm = { height = 0.88,depth = 0.12, align = 'middle', glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, + [8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, +-- [9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, +-- [15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, @@ -417,26 +417,26 @@ local jfm = { height = 0.88,depth = 0.12, align = 'middle', glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, + [8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, +-- [9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, +-- [15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, @@ -457,26 +457,26 @@ local jfm = { height = 0.88,depth = 0.12, align = 'middle', glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, + [8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, +-- [9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, +-- [15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}}, @@ -497,26 +497,26 @@ local jfm = { height = 0.88,depth = 0.12, align = 'middle', glue = { - [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, --- [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, - [0] = {0, 0.25, 0, priority = {0,0}}, - [27] = {0, 0.25, 0, priority = {0,0}}, + [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, +-- [8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [14] = {0, 0, 0, kanjiskip_natural = 1}, +-- [15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [27] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0, 0.25, 0, priority = {0,0}}, @@ -537,26 +537,26 @@ local jfm = { height = 0.88,depth = 0.12, align = 'middle', glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, --- [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, - [0] = {0, 0.25, 0, priority = {0,0}}, - [27] = {0, 0.25, 0, priority = {0,0}}, + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, +-- [8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, +-- [15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [27] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0, 0.25, 0, priority = {0,0}}, @@ -577,26 +577,26 @@ local jfm = { align = 'middle', width= 1,height = 0.88,depth = 0.12, glue = { - [1] = {0, stretch_width, 0, priority = {-1,0}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, - [9] = {0, 0, 0}, - [10] = {0, 0, 0}, - [11] = {0, 0, 0}, - [12] = {0, stretch_width, 0, priority = {-1,0}}, - [13] = {0, stretch_width, 0, priority = {-1,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, - [15] = {0, stretch_width, 0, priority = {-1,0}}, - [16] = {0, stretch_width, 0, priority = {-1,0}}, - [0] = {0, stretch_width, 0, priority = {-1,0}}, - [27] = {0, stretch_width, 0, priority = {-1,0}}, + [1] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, + [8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [9] = {0, 0, 0, kanjiskip_natural = 1}, + [10] = {0, 0, 0, kanjiskip_natural = 1}, + [11] = {0, 0, 0, kanjiskip_natural = 1}, + [12] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [13] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [15] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [16] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [0] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, + [27] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0, 0, 0}, @@ -617,26 +617,26 @@ local jfm = { height = 0.88,depth = 0.12, align = 'middle', glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, --- [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, +-- [8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [14] = {0, 0, 0, kanjiskip_natural = 1}, +-- [15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, @@ -659,26 +659,26 @@ local jfm = { height = 0.88,depth = 0.12, align = 'middle', glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, --- [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, +-- [8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [14] = {0, 0, 0, kanjiskip_natural = 1}, +-- [15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, @@ -716,26 +716,26 @@ local jfm = { align = 'middle', width = 1,height = 0.88,depth = 0.12, glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, --- [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, +-- [8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, + [14] = {0, 0, 0, kanjiskip_natural = 1}, +-- [15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, @@ -1003,26 +1003,26 @@ local jfm = { [27] = {-- 欧文 chars = {'alchar'}, glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, --- [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, --- [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [12] = {0, 0.25, 0, priority = {0,0}}, + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1}, + [2] = {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}, + [4] = {0, 0, 0, kanjiskip_natural = 1}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1}, + [6] = {0, 0, 0, kanjiskip_natural = 1}, + [7] = {0, 0, 0, kanjiskip_natural = 1}, + [8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, +-- [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1}, +-- [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1}, +-- [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1}, + [12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1}, [13] = {0, 0.25, 0, priority = {0,0}},-- 空け注10 - [14] = {0, 0, 0}, --- [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, --- [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, --- [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, --- [27] = {0, 0, 0, ratio = 0, priority = {1,0}}, + [14] = {0, 0, 0, kanjiskip_natural = 1}, +-- [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1}, +-- [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1}, +-- [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1}, +-- [27] = {0, 0, 0, ratio = 0, priority = {1,0}, kanjiskip_natural = 1}, --[[ [20] = {0, 0, 0}, [21] = {0, 0.25, 0, priority = {0,0}}, diff --git a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua index eb88fd30480..5e17344a9e8 100644 --- a/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua +++ b/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua @@ -7,24 +7,66 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [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, @@ -35,32 +77,128 @@ local jfm={ ["chars"]={ "(", "〔", "[", "{", "〈", "《", "「", "『", "【", "⦅", "〘", "〖", "«", "〝", "‘", "“" }, ["depth"]=0.5, ["glue"]={ - [0]={ 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + [0]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + { + 0, + 0, + 0, + ["kanjiskip_natural"]=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 }, - [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, - [12]={ 0, 0, 0 }, - [13]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [15]={ 0, 0, 0 }, - [16]={ 0, 0, 0 }, - [27]={ 0, 0, 0 }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [8]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [9]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [10]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [11]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [12]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [13]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [14]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [15]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [16]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [27]={ + 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, @@ -75,6 +213,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -82,14 +221,21 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, - { 0, 0, 0 }, + { + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [4]={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -97,15 +243,27 @@ local jfm={ 0.25, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=1, }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -113,6 +271,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -120,6 +279,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -127,6 +287,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -134,6 +295,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -141,6 +303,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -148,12 +311,14 @@ local jfm={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [15]={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -161,6 +326,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -168,6 +334,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -175,6 +342,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -182,6 +350,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -189,6 +358,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -205,68 +375,127 @@ local jfm={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, { 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [4]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [5]={ 0.25, 0.25, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -1 }, ["ratio"]=1, }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, + [9]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [10]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [11]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [12]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [13]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [14]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [15]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [16]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [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"]=1, @@ -281,6 +510,7 @@ local jfm={ 0.25, 0.25, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -1 }, ["ratio"]=0, }, @@ -288,6 +518,7 @@ local jfm={ 0.25, 0.25, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -1 }, ["ratio"]=0, }, @@ -295,6 +526,7 @@ local jfm={ 0.25, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0, }, @@ -302,6 +534,7 @@ local jfm={ 0.25, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0, }, @@ -309,6 +542,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0.5, }, @@ -316,6 +550,7 @@ local jfm={ 0.25, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0, }, @@ -323,6 +558,7 @@ local jfm={ 0.25, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0, }, @@ -330,6 +566,7 @@ local jfm={ 0.25, 0.25, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -1 }, ["ratio"]=0, }, @@ -337,6 +574,7 @@ local jfm={ 0.25, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0, }, @@ -344,6 +582,7 @@ local jfm={ 0.25, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0, }, @@ -351,6 +590,7 @@ local jfm={ 0.25, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0, }, @@ -358,6 +598,7 @@ local jfm={ 0.25, 0.25, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -1 }, ["ratio"]=0, }, @@ -365,6 +606,7 @@ local jfm={ 0.25, 0.25, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -1 }, ["ratio"]=0, }, @@ -372,6 +614,7 @@ local jfm={ 0.25, 0.25, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -1 }, ["ratio"]=0, }, @@ -379,6 +622,7 @@ local jfm={ 0.25, 0.25, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -1 }, ["ratio"]=0, }, @@ -386,6 +630,7 @@ local jfm={ 0.25, 0.25, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -1 }, ["ratio"]=0, }, @@ -393,6 +638,7 @@ local jfm={ 0.25, 0.25, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -1 }, ["ratio"]=0, }, @@ -400,6 +646,7 @@ local jfm={ 0.25, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0, }, @@ -407,6 +654,7 @@ local jfm={ 0.25, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0, }, @@ -414,6 +662,7 @@ local jfm={ 0.25, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0, }, @@ -431,6 +680,7 @@ local jfm={ 0.5, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, ["ratio"]=0, }, @@ -438,29 +688,48 @@ local jfm={ 0.5, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, ["ratio"]=0, }, - { 0, 0, 0 }, + { + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [4]={ 0.5, 0, 0, + ["kanjiskip_natural"]=1, ["ratio"]=0, }, [5]={ 0.75, 0, 0.25, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0.33333333, }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0.5, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, ["ratio"]=0, }, @@ -468,24 +737,28 @@ local jfm={ 0.5, 0, 0, + ["kanjiskip_natural"]=1, ["ratio"]=0, }, [10]={ 0.5, 0, 0, + ["kanjiskip_natural"]=1, ["ratio"]=0, }, [11]={ 0.5, 0, 0, + ["kanjiskip_natural"]=1, ["ratio"]=0, }, [12]={ 0.5, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, ["ratio"]=0, }, @@ -493,6 +766,7 @@ local jfm={ 0.5, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, ["ratio"]=0, }, @@ -500,6 +774,7 @@ local jfm={ 0.5, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, ["ratio"]=0, }, @@ -507,6 +782,7 @@ local jfm={ 0.5, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, ["ratio"]=0, }, @@ -514,6 +790,7 @@ local jfm={ 0.5, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, ["ratio"]=0, }, @@ -521,6 +798,7 @@ local jfm={ 0.5, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, ["ratio"]=0, }, @@ -528,18 +806,21 @@ local jfm={ 0.5, 0, 0, + ["kanjiskip_natural"]=1, ["ratio"]=0, }, [301]={ 0.5, 0, 0, + ["kanjiskip_natural"]=1, ["ratio"]=0, }, [302]={ 0.5, 0, 0, + ["kanjiskip_natural"]=1, ["ratio"]=0, }, }, @@ -556,6 +837,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -563,14 +845,21 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, - { 0, 0, 0 }, + { + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [4]={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -578,15 +867,27 @@ local jfm={ 0.75, 0, 0.75, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -1 }, ["ratio"]=0.33333333, }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -594,6 +895,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -601,6 +903,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -608,6 +911,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -615,6 +919,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -622,6 +927,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -629,6 +935,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -636,6 +943,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -643,6 +951,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -650,6 +959,7 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=0, }, @@ -657,6 +967,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -664,6 +975,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -671,6 +983,7 @@ local jfm={ 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=0, }, @@ -687,38 +1000,82 @@ local jfm={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ 0, 0 }, }, { 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [27]={ + [6]={ 0, - 0.25, 0, - ["priority"]={ 0, 0 }, + 0, + ["kanjiskip_natural"]=1, }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [8]={ 0, 0, 0 }, + [14]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [27]={ + 0, + 0.25, + 0, + ["kanjiskip_natural"]=1, + ["priority"]={ 0, 0 }, + }, + [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"]=1, }, @@ -731,35 +1088,74 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [14]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [300]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [301]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [302]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, }, ["height"]=0.5, }, @@ -772,35 +1168,74 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [14]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [300]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [301]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [302]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, }, ["height"]=0.5, }, @@ -813,35 +1248,74 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [14]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [300]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [301]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [302]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, }, ["height"]=0.5, }, @@ -854,36 +1328,80 @@ local jfm={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ 0, 0 }, }, { 0.5, 0, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ 0, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [14]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [27]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ 0, 0 }, }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [300]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [301]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [302]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, }, ["height"]=0.5, }, @@ -896,41 +1414,81 @@ local jfm={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ 0, 0 }, }, { 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [14]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [27]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ 0, 0 }, }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [300]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [301]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [302]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, }, ["height"]=0.5, }, @@ -943,73 +1501,133 @@ local jfm={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, { 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, + [9]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [10]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [11]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [12]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [13]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [14]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [15]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [16]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [27]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [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"]=1, @@ -1023,24 +1641,66 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, + { + 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.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [301]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [302]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, }, ["height"]=0.5, }, @@ -1053,24 +1713,66 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [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, }, @@ -1082,30 +1784,54 @@ local jfm={ 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ 0, 0 }, }, [12]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ 0, 0 }, }, [13]={ @@ -1114,10 +1840,30 @@ local jfm={ 0, ["priority"]={ 0, 0 }, }, - [14]={ 0, 0, 0 }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [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, }, @@ -1138,74 +1884,134 @@ local jfm={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, { 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, + [9]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [10]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [11]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [12]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [13]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [14]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [15]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [16]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [27]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [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.25, @@ -1219,74 +2025,134 @@ local jfm={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, { 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, + [9]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [10]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [11]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [12]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [13]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [14]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [15]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [16]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [27]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [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, @@ -1300,74 +2166,134 @@ local jfm={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, { 0.5, 0.25, 0.5, + ["kanjiskip_natural"]=1, ["priority"]={ -1, -2 }, ["ratio"]=1, }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, + { + 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 }, - [7]={ 0, 0, 0 }, + [6]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [7]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [8]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, + [9]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [10]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, + [11]={ + 0, + 0, + 0, + ["kanjiskip_natural"]=1, + }, [12]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [13]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [14]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [15]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [16]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, [27]={ 0, 0.25, 0, + ["kanjiskip_natural"]=1, ["priority"]={ -1, 0 }, }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, + [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"]=1, -- cgit v1.2.3