Merge branch 'patch-【磨】'

jurliyuuri · Nov 14, 2024 · 3ee9256 · 3ee9256
2 parents d69ba3e + 2cd28f7
commit 3ee9256
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 8 deletions.
diff --git a/composition.txt b/composition.txt
@@ -473,4 +473,5 @@
 豚	⿱獣水
 豕	⿲之之之
 泪	⿱平水
-橘	⿰木挽
+橘	⿰木挽
+磨	⿰金布
diff --git a/image_table/char_and_folder_info.js b/image_table/char_and_folder_info.js
@@ -18,7 +18,7 @@ const linzi_list = ["我", "汝", "此", "其", "彼", "何", "或", "全", "無
     "招", "賢", "緑", "虹", "雷", "靴", "麦", "棆", "眉", "残", "豚", "豕", "泪", "橘"
 ]; // REQUIRES CONSTANT UPDATE
 const defined_but_no_image_prepared = [];
-const linzi_glyph_not_defined = ["磨", "帯", "謎", "辿", "千", "旦", "強", "孰", "那", "茲", "詞", "埴", "試", "洛", "趙", "倶", "億", "訴", "嘗", "靴"]; // REQUIRES CONSTANT UPDATE
+const linzi_glyph_not_defined = ["帯", "謎", "辿", "千", "旦", "強", "孰", "那", "茲", "詞", "埴", "試", "洛", "趙", "倶", "億", "訴", "嘗", "靴"]; // REQUIRES CONSTANT UPDATE
 const folder_type = {
     "燐字画像": "SY",
     "燐字画像2": "border",

diff --git a/image_table/composition.js b/image_table/composition.js
diff --git a/image_table/image_existence_table.js b/image_table/image_existence_table.js
@@ -306,8 +306,8 @@ const NEW_IMAGE_EXISTENCE_TABLE = {
     "燐字画像53": ["哦", "嗚", "悖", "叮", "斥", "半"],
     "燐字画像54": ["逆", "塩", "鹽", "鹵", "苦", "渋", "辣", "節", "土", "田", "旱", "氾", "腰", "像", "踵", "匁", "飢", "支", "奉", "捧", "贄", "鍬", "謗", "佞", "麺", "餅", "癒"],
     "燐字画像55": ["逆", "塩", "鹽", "鹵", "苦", "渋", "辣", "節", "土", "田", "旱", "氾", "腰", "像", "踵", "匁", "飢", "支", "奉", "捧", "贄", "鍬", "謗", "佞", "麺", "餅", "癒"],
-    "燐字画像56": ["賢", "招", "緑", "虹", "雷", "麦", "棆", "遅", "眉", "残", "豚", "豕"],
-    "燐字画像57": ["賢", "招", "緑", "虹", "雷", "麦", "棆", "遅", "眉", "残", "豚", "豕"],
+    "燐字画像56": ["賢", "招", "緑", "虹", "雷", "麦", "棆", "遅", "眉", "残", "豚", "豕", "磨"],
+    "燐字画像57": ["賢", "招", "緑", "虹", "雷", "麦", "棆", "遅", "眉", "残", "豚", "豕", "磨"],
     "燐字画像58": ["斥", "塩", "遅", "癒", "叮"],
     "燐字画像59": [
         "緑", "渋", "慥", "子", "虹", "辣", "釘", "万", "雷", "槌", "塩", "麦", "田", "遅", "棆", "旱", "半", "泪", "氾", "呉",

diff --git a/image_table/stroke_data.js b/image_table/stroke_data.js
@@ -488,6 +488,7 @@ const strokes_ = {
     豕: () => [...strokes2("之"), ...strokes2("之"), ...strokes2("之")],
     泪: () => [...strokes2("平"), ...strokes2("水")],
     橘: () => [...strokes2("木"), ...strokes2("挽")],
+    磨: () => [...strokes2("金"), ...strokes2("布")],
 };
 const STROKE_DATA = linzi_list_with_glyphs_defined.map((linzi) => {
     return {

diff --git a/image_table_ts/char_and_folder_info.ts b/image_table_ts/char_and_folder_info.ts
@@ -31,7 +31,7 @@ type Linzi = typeof linzi_list[number];
 
 const defined_but_no_image_prepared: ReadonlyArray<Linzi> = [];
 
-const linzi_glyph_not_defined = ["磨", "帯", "謎", "辿", "千", "旦", "強", "孰", "那", "茲", "詞", "埴", "試", "洛", "趙", "倶", "億", "訴", "嘗", "靴"] as const; // REQUIRES CONSTANT UPDATE
+const linzi_glyph_not_defined = ["帯", "謎", "辿", "千", "旦", "強", "孰", "那", "茲", "詞", "埴", "試", "洛", "趙", "倶", "億", "訴", "嘗", "靴"] as const; // REQUIRES CONSTANT UPDATE
 
 type LinziGlyphNotDefined = typeof linzi_glyph_not_defined[number];
 

diff --git a/image_table_ts/composition.ts b/image_table_ts/composition.ts
@@ -44,7 +44,7 @@ type id = "五" | "人" | "之" | "上" | "手" | "一" | "足" | "閉" | "無"
     "斥" | "半" | "逆" | "鹽" | "塩" | "苦" | "渋" | "辣" | "節" | "田" |
     "土" | "旱" | "氾" | "腰" | "像" | "鹵" | "匁" | "飢" | "遅" | "支" |
     "奉" | "捧" | "贄" | "鍬" | "謗" | "佞" | "麺" | "餅" | "招" | "賢" |
-    "緑" | "虹" | "雷" | "呉" | "＊フ" | "麦" | "棆" | "眉" | "残" | "豚" | "豕" | "橘";
+    "緑" | "虹" | "雷" | "呉" | "＊フ" | "麦" | "棆" | "眉" | "残" | "豚" | "豕" | "橘" | "磨";
 
 
 const non_linzi_id_list = ["＊ㄉ", "＊フ"] as const;
@@ -535,4 +535,5 @@ const composition2: Composition = {
     "豚": { "index": 526, "isDecomposable": true, "hanzi": "豚", "composition": ["⿱獣水"], "strokeCount": ["獣", "水"] },
     "豕": { "index": 527, "isDecomposable": true, "hanzi": "豕", "composition": ["⿲之之之"], "strokeCount": ["之", "之", "之"] },
     "橘": { "index": 528, "isDecomposable": true, "hanzi": "橘", "composition": ["⿰木挽"], "strokeCount": ["木", "挽"] },
+    "磨": { "index": 529, "isDecomposable": true, "hanzi": "磨", "composition": ["⿰金布"], "strokeCount": ["金", "布"] },
 }
diff --git a/image_table_ts/image_existence_table.ts b/image_table_ts/image_existence_table.ts
@@ -390,8 +390,8 @@ const NEW_IMAGE_EXISTENCE_TABLE: NewImageExistenceTable = {
     "燐字画像53": ["哦", "嗚", "悖", "叮", "斥", "半"],
     "燐字画像54": ["逆", "塩", "鹽", "鹵", "苦", "渋", "辣", "節", "土", "田", "旱", "氾", "腰", "像", "踵", "匁", "飢", "支", "奉", "捧", "贄", "鍬", "謗", "佞", "麺", "餅", "癒"],
     "燐字画像55": ["逆", "塩", "鹽", "鹵", "苦", "渋", "辣", "節", "土", "田", "旱", "氾", "腰", "像", "踵", "匁", "飢", "支", "奉", "捧", "贄", "鍬", "謗", "佞", "麺", "餅", "癒"],
-    "燐字画像56": ["賢", "招", "緑", "虹", "雷", "麦", "棆", "遅", "眉", "残", "豚", "豕"],
-    "燐字画像57": ["賢", "招", "緑", "虹", "雷", "麦", "棆", "遅", "眉", "残", "豚", "豕"],
+    "燐字画像56": ["賢", "招", "緑", "虹", "雷", "麦", "棆", "遅", "眉", "残", "豚", "豕", "磨"],
+    "燐字画像57": ["賢", "招", "緑", "虹", "雷", "麦", "棆", "遅", "眉", "残", "豚", "豕", "磨"],
     "燐字画像58": ["斥", "塩", "遅", "癒", "叮"],
     "燐字画像59": [
         "緑", "渋", "慥", "子", "虹", "辣", "釘", "万", "雷", "槌", "塩", "麦", "田", "遅", "棆", "旱", "半", "泪", "氾", "呉",

diff --git a/image_table_ts/stroke_data.ts b/image_table_ts/stroke_data.ts
@@ -508,6 +508,7 @@ const strokes_: StrokeData = {
     豕: () => [...strokes2("之"), ...strokes2("之"), ...strokes2("之")],
     泪: () => [...strokes2("平"), ...strokes2("水")],
     橘: () => [...strokes2("木"), ...strokes2("挽")],
+    磨: () => [...strokes2("金"), ...strokes2("布")],
 };
 
 const STROKE_DATA = linzi_list_with_glyphs_defined.map((linzi) => {

diff --git a/燐字画像56/磨.png b/燐字画像56/磨.png
diff --git a/燐字画像57/磨.png b/燐字画像57/磨.png