From 04b6bf05c4beeebb7f50b7de73e2ad5ce9221f19 Mon Sep 17 00:00:00 2001 From: ikawaha Date: Tue, 22 Nov 2022 14:44:39 +0900 Subject: [PATCH 1/5] chore: Add code builder of an old-new form table --- tool/oldformtonewbuilder/main.go | 50 ++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 tool/oldformtonewbuilder/main.go diff --git a/tool/oldformtonewbuilder/main.go b/tool/oldformtonewbuilder/main.go new file mode 100644 index 0000000..248c8c9 --- /dev/null +++ b/tool/oldformtonewbuilder/main.go @@ -0,0 +1,50 @@ +package main + +import ( + "bufio" + "bytes" + "fmt" + "log" + "os" + "strings" +) + +func main() { + if err := run(); err != nil { + log.Println(err) + os.Exit(1) + } +} + +func run() error { + f, err := os.Open("../../testdata/golden_old-new.txt") + if err != nil { + return err + } + defer f.Close() + + s := bufio.NewScanner(f) + var ( + line int + b bytes.Buffer + ) + b.WriteString("var oldnew = []string{\n") + for s.Scan() { + l := s.Text() + line++ + if strings.HasPrefix(l, "!") { + continue + } + a := strings.Split(l, " ") + if len(a) != 4 { + return fmt.Errorf("invalid golden file format, line=%d, %s", line, l) + } + b.WriteString(`"\u` + a[0] + `", "\u` + a[2] + `", //` + a[1] + ", " + a[3] + "\n") + } + if err := s.Err(); err != nil { + return err + } + b.WriteString("}") + fmt.Println(b.String()) + return nil +} From 16a4ace200f0f3df2a0ce92722543af2a401acf8 Mon Sep 17 00:00:00 2001 From: ikawaha Date: Tue, 22 Nov 2022 14:45:51 +0900 Subject: [PATCH 2/5] improve: Add a replacer of old form to new form --- replace_old_new.go | 378 ++++++++++++++++++++++++++++++++++++++++ replace_old_new_test.go | 50 ++++++ 2 files changed, 428 insertions(+) create mode 100644 replace_old_new.go create mode 100644 replace_old_new_test.go diff --git a/replace_old_new.go b/replace_old_new.go new file mode 100644 index 0000000..df6ec57 --- /dev/null +++ b/replace_old_new.go @@ -0,0 +1,378 @@ +package kanji + +import ( + "strings" +) + +// NewOldFormNewFormReplacer is a replacer of old form (旧字体) to new form (新字体). +func NewOldFormNewFormReplacer() *strings.Replacer { + return strings.NewReplacer(OldFormNewForm...) +} + +// OldFormNewForm is replacement pairs of old form (旧字体) and new form (新字体). +var OldFormNewForm = []string{ + "\u4E9E", "\u4E9C", //亞, 亜 + "\u60E1", "\u60AA", //惡, 悪 + "\u58D3", "\u5727", //壓, 圧 + "\u570D", "\u56F2", //圍, 囲 + "\u7232", "\u70BA", //爲, 為 + "\u91AB", "\u533B", //醫, 医 + "\u58F9", "\u58F1", //壹, 壱 + "\uFA67", "\u9038", //逸, 逸 + "\u7A3B", "\u7A32", //稻, 稲 + "\u96B1", "\u96A0", //隱, 隠 + "\u71DF", "\u55B6", //營, 営 + "\u69AE", "\u6804", //榮, 栄 + "\u885E", "\u885B", //衞, 衛 + "\u9A5B", "\u99C5", //驛, 駅 + "\uFA62", "\u8B01", //謁, 謁 + "\u5713", "\u5186", //圓, 円 + "\u7DE3", "\u7E01", //緣, 縁 + "\u8277", "\u8276", //艷, 艶 + "\u9E7D", "\u5869", //鹽, 塩 + "\u5967", "\u5965", //奧, 奥 + "\u61C9", "\u5FDC", //應, 応 + "\u6A6B", "\u6A2A", //橫, 横 + "\u6B50", "\u6B27", //歐, 欧 + "\u6BC6", "\u6BB4", //毆, 殴 + "\u9EC3", "\u9EC4", //黃, 黄 + "\u6EAB", "\u6E29", //溫, 温 + "\u7A69", "\u7A4F", //穩, 穏 + "\u5047", "\u4EEE", //假, 仮 + "\u50F9", "\u4FA1", //價, 価 + "\uFA52", "\u798D", //禍, 禍 + "\u756B", "\u753B", //畫, 画 + "\u6703", "\u4F1A", //會, 会 + "\u58DE", "\u58CA", //壞, 壊 + "\uFA3D", "\u6094", //悔, 悔 + "\u61F7", "\u61D0", //懷, 懐 + "\uFA45", "\u6D77", //海, 海 + "\u7E6A", "\u7D75", //繪, 絵 + "\uFA3E", "\u6168", //慨, 慨 + "\u69EA", "\u6982", //槪, 概 + "\u64F4", "\u62E1", //擴, 拡 + "\u6BBC", "\u6BBB", //殼, 殻 + "\u89BA", "\u899A", //覺, 覚 + "\u5B78", "\u5B66", //學, 学 + "\u5DBD", "\u5CB3", //嶽, 岳 + "\u6A02", "\u697D", //樂, 楽 + "\uFA36", "\u559D", //喝, 喝 + "\u6E34", "\u6E07", //渴, 渇 + "\uFA60", "\u8910", //褐, 褐 + "\u52F8", "\u52E7", //勸, 勧 + "\u5377", "\u5DFB", //卷, 巻 + "\u5BEC", "\u5BDB", //寬, 寛 + "\u6B61", "\u6B53", //歡, 歓 + "\uFA47", "\u6F22", //漢, 漢 + "\u7F50", "\u7F36", //罐, 缶 + "\u89C0", "\u89B3", //觀, 観 + "\u95DC", "\u95A2", //關, 関 + "\u9677", "\u9665", //陷, 陥 + "\uFA38", "\u5668", //器, 器 + "\uFA42", "\u65E2", //既, 既 + "\u6B78", "\u5E30", //歸, 帰 + "\u6C23", "\u6C17", //氣, 気 + "\uFA4E", "\u7948", //祈, 祈 + "\u9F9C", "\u4E80", //龜, 亀 + "\u50DE", "\u507D", //僞, 偽 + "\u6232", "\u622F", //戲, 戯 + "\u72A7", "\u72A0", //犧, 犠 + "\u820A", "\u65E7", //舊, 旧 + "\u64DA", "\u62E0", //據, 拠 + "\u64E7", "\u6319", //擧, 挙 + "\u865B", "\u865A", //虛, 虚 + "\u5CFD", "\u5CE1", //峽, 峡 + "\u633E", "\u631F", //挾, 挟 + "\u72F9", "\u72ED", //狹, 狭 + "\u9115", "\u90F7", //鄕, 郷 + "\uFA69", "\u97FF", //響, 響 + "\u66C9", "\u6681", //曉, 暁 + "\uFA34", "\u52E4", //勤, 勤 + "\uFA63", "\u8B39", //謹, 謹 + "\u5340", "\u533A", //區, 区 + "\u9A45", "\u99C6", //驅, 駆 + "\u52F3", "\u52F2", //勳, 勲 + "\u85B0", "\u85AB", //薰, 薫 + "\u5F91", "\u5F84", //徑, 径 + "\u60E0", "\u6075", //惠, 恵 + "\u63ED", "\u63B2", //揭, 掲 + "\u6EAA", "\u6E13", //溪, 渓 + "\u7D93", "\u7D4C", //經, 経 + "\u7E7C", "\u7D99", //繼, 継 + "\u8396", "\u830E", //莖, 茎 + "\u87A2", "\u86CD", //螢, 蛍 + "\u8F15", "\u8EFD", //輕, 軽 + "\u9DC4", "\u9D8F", //鷄, 鶏 + "\u85DD", "\u82B8", //藝, 芸 + "\u64CA", "\u6483", //擊, 撃 + "\u7F3A", "\u6B20", //缺, 欠 + "\u5109", "\u5039", //儉, 倹 + "\u528D", "\u5263", //劍, 剣 + "\u5708", "\u570F", //圈, 圏 + "\u6AA2", "\u691C", //檢, 検 + "\u6B0A", "\u6A29", //權, 権 + "\u737B", "\u732E", //獻, 献 + "\u784F", "\u7814", //硏, 研 + "\u7E23", "\u770C", //縣, 県 + "\u96AA", "\u967A", //險, 険 + "\u986F", "\u9855", //顯, 顕 + "\u9A57", "\u9A13", //驗, 験 + "\u56B4", "\u53B3", //嚴, 厳 + "\u6548", "\u52B9", //效, 効 + "\u5EE3", "\u5E83", //廣, 広 + "\u6046", "\u6052", //恆, 恒 + "\u945B", "\u9271", //鑛, 鉱 + "\u865F", "\u53F7", //號, 号 + "\u570B", "\u56FD", //國, 国 + "\uFA54", "\u7A40", //穀, 穀 + "\u9ED1", "\u9ED2", //黑, 黒 + "\u6FDF", "\u6E08", //濟, 済 + "\u788E", "\u7815", //碎, 砕 + "\u9F4B", "\u658E", //齋, 斎 + "\u5291", "\u5264", //劑, 剤 + "\u6AFB", "\u685C", //櫻, 桜 + "\uF970", "\u6BBA", //殺, 殺 + "\u96DC", "\u96D1", //雜, 雑 + "\u53C3", "\u53C2", //參, 参 + "\u6158", "\u60E8", //慘, 惨 + "\u68E7", "\u685F", //棧, 桟 + "\u8836", "\u8695", //蠶, 蚕 + "\u8D0A", "\u8CDB", //贊, 賛 + "\u6B98", "\u6B8B", //殘, 残 + "\uFA4D", "\u7949", //祉, 祉 + "\u7D72", "\u7CF8", //絲, 糸 + "\uFA61", "\u8996", //視, 視 + "\u9F52", "\u6B6F", //齒, 歯 + "\u5152", "\u5150", //兒, 児 + "\u8FAD", "\u8F9E", //辭, 辞 + "\u6FD5", "\u6E7F", //濕, 湿 + "\u5BE6", "\u5B9F", //實, 実 + "\u5BEB", "\u5199", //寫, 写 + "\uFA48", "\u716E", //煮, 煮 + "\uFA4C", "\u793E", //社, 社 + "\uFA5B", "\u8005", //者, 者 + "\u91CB", "\u91C8", //釋, 釈 + "\u58FD", "\u5BFF", //壽, 寿 + "\u6536", "\u53CE", //收, 収 + "\uFA5C", "\u81ED", //臭, 臭 + "\u5F9E", "\u5F93", //從, 従 + "\u6F81", "\u6E0B", //澁, 渋 + "\u7378", "\u7363", //獸, 獣 + "\u7E31", "\u7E26", //縱, 縦 + "\uFA51", "\u795D", //祝, 祝 + "\u8085", "\u7C9B", //肅, 粛 + "\u8655", "\u51E6", //處, 処 + "\uFA43", "\u6691", //暑, 暑 + "\u7DD6", "\u7DD2", //緖, 緒 + "\uFA5A", "\u7F72", //署, 署 + "\uFA22", "\u8AF8", //諸, 諸 + "\u654D", "\u53D9", //敍, 叙 + "\u596C", "\u5968", //奬, 奨 + "\u5C07", "\u5C06", //將, 将 + "\u6D89", "\u6E09", //涉, 渉 + "\u71D2", "\u713C", //燒, 焼 + "\uFA1A", "\u7965", //祥, 祥 + "\u7A31", "\u79F0", //稱, 称 + "\u8B49", "\u8A3C", //證, 証 + "\u4E58", "\u4E57", //乘, 乗 + "\u5269", "\u5270", //剩, 剰 + "\u58E4", "\u58CC", //壤, 壌 + "\u5B43", "\u5B22", //孃, 嬢 + "\u689D", "\u6761", //條, 条 + "\u6DE8", "\u6D44", //淨, 浄 + "\u72C0", "\u72B6", //狀, 状 + "\u758A", "\u7573", //疊, 畳 + "\u8B93", "\u8B72", //讓, 譲 + "\u91C0", "\u91B8", //釀, 醸 + "\u56D1", "\u5631", //囑, 嘱 + "\u89F8", "\u89E6", //觸, 触 + "\u5BE2", "\u5BDD", //寢, 寝 + "\u613C", "\u614E", //愼, 慎 + "\u771E", "\u771F", //眞, 真 + "\uFA19", "\u795E", //神, 神 + "\u76E1", "\u5C3D", //盡, 尽 + "\u5716", "\u56F3", //圖, 図 + "\u7CB9", "\u7C8B", //粹, 粋 + "\u9189", "\u9154", //醉, 酔 + "\u96A8", "\u968F", //隨, 随 + "\u9AD3", "\u9AC4", //髓, 髄 + "\u6578", "\u6570", //數, 数 + "\u6A1E", "\u67A2", //樞, 枢 + "\u7028", "\u702C", //瀨, 瀬 + "\u8072", "\u58F0", //聲, 声 + "\u975C", "\u9759", //靜, 静 + "\u9F4A", "\u6589", //齊, 斉 + "\u651D", "\u6442", //攝, 摂 + "\u7ACA", "\u7A83", //竊, 窃 + "\uFA56", "\u7BC0", //節, 節 + "\u5C08", "\u5C02", //專, 専 + "\u6230", "\u6226", //戰, 戦 + "\u6DFA", "\u6D45", //淺, 浅 + "\u6F5B", "\u6F5C", //潛, 潜 + "\u7E96", "\u7E4A", //纖, 繊 + "\u8E10", "\u8DF5", //踐, 践 + "\u9322", "\u92AD", //錢, 銭 + "\u79AA", "\u7985", //禪, 禅 + "\u66FE", "\u66FD", //曾, 曽 + "\uFA50", "\u7956", //祖, 祖 + "\uFA31", "\u50E7", //僧, 僧 + "\u96D9", "\u53CC", //雙, 双 + "\u58EF", "\u58EE", //壯, 壮 + "\uFA3B", "\u5C64", //層, 層 + "\u641C", "\u635C", //搜, 捜 + "\u63D2", "\u633F", //插, 挿 + "\u5DE2", "\u5DE3", //巢, 巣 + "\u722D", "\u4E89", //爭, 争 + "\u7626", "\u75E9", //瘦, 痩 + "\u7E3D", "\u7DCF", //總, 総 + "\u838A", "\u8358", //莊, 荘 + "\u88DD", "\u88C5", //裝, 装 + "\u9A37", "\u9A12", //騷, 騒 + "\u589E", "\u5897", //增, 増 + "\uFA3F", "\u618E", //憎, 憎 + "\u81DF", "\u81D3", //臟, 臓 + "\u85CF", "\u8535", //藏, 蔵 + "\uFA65", "\u8D08", //贈, 贈 + "\u537D", "\u5373", //卽, 即 + "\u5C6C", "\u5C5E", //屬, 属 + "\u7E8C", "\u7D9A", //續, 続 + "\u58AE", "\u5815", //墮, 堕 + "\u9AD4", "\u4F53", //體, 体 + "\u5C0D", "\u5BFE", //對, 対 + "\u5E36", "\u5E2F", //帶, 帯 + "\u6EEF", "\u6EDE", //滯, 滞 + "\u81FA", "\u53F0", //臺, 台 + "\u7027", "\u6EDD", //瀧, 滝 + "\u64C7", "\u629E", //擇, 択 + "\u6FA4", "\u6CA2", //澤, 沢 + "\u55AE", "\u5358", //單, 単 + "\uFA37", "\u5606", //嘆, 嘆 + "\u64D4", "\u62C5", //擔, 担 + "\u81BD", "\u80C6", //膽, 胆 + "\u5718", "\u56E3", //團, 団 + "\u5F48", "\u5F3E", //彈, 弾 + "\u65B7", "\u65AD", //斷, 断 + "\u7661", "\u75F4", //癡, 痴 + "\u9072", "\u9045", //遲, 遅 + "\u665D", "\u663C", //晝, 昼 + "\u87F2", "\u866B", //蟲, 虫 + "\u9444", "\u92F3", //鑄, 鋳 + "\uFA5F", "\u8457", //著, 著 + "\u5EF3", "\u5E81", //廳, 庁 + "\u5FB5", "\u5FB4", //徵, 徴 + "\uFA40", "\u61F2", //懲, 懲 + "\u807D", "\u8074", //聽, 聴 + "\u6555", "\u52C5", //敕, 勅 + "\u93AD", "\u93AE", //鎭, 鎮 + "\uFA10", "\u585A", //塚, 塚 + "\u905E", "\u9013", //遞, 逓 + "\u9435", "\u9244", //鐵, 鉄 + "\u8F49", "\u8EE2", //轉, 転 + "\u9EDE", "\u70B9", //點, 点 + "\u50B3", "\u4F1D", //傳, 伝 + "\uFA26", "\u90FD", //都, 都 + "\u9EE8", "\u515A", //黨, 党 + "\u76DC", "\u76D7", //盜, 盗 + "\u71C8", "\u706F", //燈, 灯 + "\u7576", "\u5F53", //當, 当 + "\u9B2D", "\u95D8", //鬭, 闘 + "\u5FB7", "\u5FB3", //德, 徳 + "\u7368", "\u72EC", //獨, 独 + "\u8B80", "\u8AAD", //讀, 読 + "\uFA55", "\u7A81", //突, 突 + "\u5C46", "\u5C4A", //屆, 届 + "\u7E69", "\u7E04", //繩, 縄 + "\uFA68", "\u96E3", //難, 難 + "\u8CB3", "\u5F10", //貳, 弐 + "\u60F1", "\u60A9", //惱, 悩 + "\u8166", "\u8133", //腦, 脳 + "\u9738", "\u8987", //霸, 覇 + "\u5EE2", "\u5EC3", //廢, 廃 + "\u62DC", "\u62DD", //拜, 拝 + "\uFA44", "\u6885", //梅, 梅 + "\u8CE3", "\u58F2", //賣, 売 + "\u9EA5", "\u9EA6", //麥, 麦 + "\u767C", "\u767A", //發, 発 + "\u9AEE", "\u9AEA", //髮, 髪 + "\u62D4", "\u629C", //拔, 抜 + "\uFA59", "\u7E41", //繁, 繁 + "\u665A", "\u6669", //晚, 晩 + "\u883B", "\u86EE", //蠻, 蛮 + "\uFA35", "\u5351", //卑, 卑 + "\uFA4B", "\u7891", //碑, 碑 + "\u7955", "\u79D8", //祕, 秘 + "\u6FF1", "\u6D5C", //濱, 浜 + "\uFA64", "\u8CD3", //賓, 賓 + "\uFA6A", "\u983B", //頻, 頻 + "\uFA41", "\u654F", //敏, 敏 + "\u7501", "\u74F6", //甁, 瓶 + "\uFA30", "\u4FAE", //侮, 侮 + "\uFA1B", "\u798F", //福, 福 + "\u62C2", "\u6255", //拂, 払 + "\u4F5B", "\u4ECF", //佛, 仏 + "\u5002", "\u4F75", //倂, 併 + "\uFA39", "\u5840", //塀, 塀 + "\u7ADD", "\u4E26", //竝, 並 + "\u8B8A", "\u5909", //變, 変 + "\u908A", "\u8FBA", //邊, 辺 + "\uFA33", "\u52C9", //勉, 勉 + "\u8FA8", "\u5F01", //辨, 弁 + "\u74E3", "\u5F01", //瓣, 弁 + "\u8FAF", "\u5F01", //辯, 弁 + "\u6B65", "\u6B69", //步, 歩 + "\u7A57", "\u7A42", //穗, 穂 + "\u5BF6", "\u5B9D", //寶, 宝 + "\u8943", "\u8912", //襃, 褒 + "\u8C50", "\u8C4A", //豐, 豊 + "\uFA3A", "\u58A8", //墨, 墨 + "\u98DC", "\u7FFB", //飜, 翻 + "\u6BCF", "\u6BCE", //每, 毎 + "\u842C", "\u4E07", //萬, 万 + "\u6EFF", "\u6E80", //滿, 満 + "\uFA32", "\u514D", //免, 免 + "\u9EB5", "\u9EBA", //麵, 麺 + "\u9ED8", "\u9ED9", //默, 黙 + "\u9920", "\u9905", //餠, 餅 + "\u623E", "\u623B", //戾, 戻 + "\u5F4C", "\u5F25", //彌, 弥 + "\u85E5", "\u85AC", //藥, 薬 + "\u8B6F", "\u8A33", //譯, 訳 + "\u8C6B", "\u4E88", //豫, 予 + "\u9918", "\u4F59", //餘, 余 + "\u8207", "\u4E0E", //與, 与 + "\u8B7D", "\u8A89", //譽, 誉 + "\u6416", "\u63FA", //搖, 揺 + "\u6A23", "\u69D8", //樣, 様 + "\u8B20", "\u8B21", //謠, 謡 + "\u4F86", "\u6765", //來, 来 + "\u8CF4", "\u983C", //賴, 頼 + "\u4E82", "\u4E71", //亂, 乱 + "\uF91D", "\u6B04", //欄, 欄 + "\u89BD", "\u89A7", //覽, 覧 + "\uF9DC", "\u9686", //隆, 隆 + "\u9F8D", "\u7ADC", //龍, 竜 + "\uF936", "\u865C", //虜, 虜 + "\u5169", "\u4E21", //兩, 両 + "\u7375", "\u731F", //獵, 猟 + "\u7DA0", "\u7DD1", //綠, 緑 + "\u58D8", "\u5841", //壘, 塁 + "\u6DDA", "\u6D99", //淚, 涙 + "\uF9D0", "\u985E", //類, 類 + "\u52F5", "\u52B1", //勵, 励 + "\u79AE", "\u793C", //禮, 礼 + "\u9748", "\u970A", //靈, 霊 + "\u9F61", "\u9F62", //齡, 齢 + "\u66C6", "\u66A6", //曆, 暦 + "\u6B77", "\u6B74", //歷, 歴 + "\u6200", "\u604B", //戀, 恋 + "\uFA57", "\u7DF4", //練, 練 + "\u934A", "\u932C", //鍊, 錬 + "\u7210", "\u7089", //爐, 炉 + "\u52DE", "\u52B4", //勞, 労 + "\uF928", "\u5ECA", //廊, 廊 + "\uF929", "\u6717", //朗, 朗 + "\u6A13", "\u697C", //樓, 楼 + "\u90DE", "\u90CE", //郞, 郎 + "\u9304", "\u9332", //錄, 録 + "\u7063", "\u6E7E", //灣, 湾 +} diff --git a/replace_old_new_test.go b/replace_old_new_test.go new file mode 100644 index 0000000..a422af5 --- /dev/null +++ b/replace_old_new_test.go @@ -0,0 +1,50 @@ +package kanji + +import ( + "bufio" + "os" + "strconv" + "strings" + "testing" +) + +func TestNewOldFormNewFormReplacer(t *testing.T) { + f, err := os.Open("./testdata/golden_old-new.txt") + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + defer f.Close() + + replacer := NewOldFormNewFormReplacer() + + s := bufio.NewScanner(f) + var line int + for s.Scan() { + l := s.Text() + line++ + if strings.HasPrefix(l, "!") { + continue + } + a := strings.Split(l, " ") + if len(a) != 4 { + t.Errorf("invalid golden file, line=%d, %s", line, l) + continue + } + code, err := strconv.ParseInt(a[0], 16, strconv.IntSize) + if err != nil { + t.Errorf("invalid golden file, line=%d, parse int error %v, %s", line, err, l) + continue + } + r := rune(code) + t.Run(l, func(t *testing.T) { + got := replacer.Replace(string(r)) + want := a[3] + if got != want { + t.Errorf("want %s, got %s", want, got) + } + }) + } + if err := s.Err(); err != nil { + t.Errorf("unexpected error, %v", err) + } +} From a4dd208b4846e29acb75048334aace41e531b3db Mon Sep 17 00:00:00 2001 From: ikawaha Date: Tue, 22 Nov 2022 14:47:39 +0900 Subject: [PATCH 3/5] chore: Update golangci-lint setting --- .golangci.yml | 4 ++++ for_personal_name_test.go | 2 +- regularuse_test.go | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 3178399..3fa06ff 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -16,6 +16,10 @@ linters: - exhaustive - asciicheck - scopelint + - gosec + - structcheck + - varcheck + - deadcode presets: - bugs - unused diff --git a/for_personal_name_test.go b/for_personal_name_test.go index e081125..d6c0e8f 100644 --- a/for_personal_name_test.go +++ b/for_personal_name_test.go @@ -13,7 +13,7 @@ func TestIsForPersonalNames(t *testing.T) { if err != nil { t.Fatalf("unexpected error, %v", err) } - defer f.Close() //nolint: gosec + defer f.Close() s := bufio.NewScanner(f) s.Scan() line := s.Text() diff --git a/regularuse_test.go b/regularuse_test.go index 1633353..0de073f 100644 --- a/regularuse_test.go +++ b/regularuse_test.go @@ -13,7 +13,7 @@ func TestIs_Golden(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - defer f.Close() //nolint: gosec + defer f.Close() s := bufio.NewScanner(f) var line int for s.Scan() { @@ -61,7 +61,7 @@ func TestIsOldFormRegularUse(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - defer f.Close() //nolint: gosec + defer f.Close() s := bufio.NewScanner(f) var line int for s.Scan() { From d39e26495fdf75a44c7f3e3cb03615fb08fc21fa Mon Sep 17 00:00:00 2001 From: ikawaha Date: Tue, 22 Nov 2022 14:50:55 +0900 Subject: [PATCH 4/5] chore: Add package comment --- doc.go | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc.go diff --git a/doc.go b/doc.go new file mode 100644 index 0000000..3d15cbc --- /dev/null +++ b/doc.go @@ -0,0 +1,3 @@ +// Package kanji is a library for the Japanese kanji, +// including the regular-use kanji characters (常用漢字表), etc. +package kanji From 2903e04b64c8e0d7a4edefdb43ebf8282bcf38c3 Mon Sep 17 00:00:00 2001 From: ikawaha Date: Tue, 22 Nov 2022 15:01:57 +0900 Subject: [PATCH 5/5] chore: Cosme --- replace_old_new.go | 728 +++++++++++++++---------------- tool/oldformtonewbuilder/main.go | 2 +- 2 files changed, 365 insertions(+), 365 deletions(-) diff --git a/replace_old_new.go b/replace_old_new.go index df6ec57..27d261f 100644 --- a/replace_old_new.go +++ b/replace_old_new.go @@ -11,368 +11,368 @@ func NewOldFormNewFormReplacer() *strings.Replacer { // OldFormNewForm is replacement pairs of old form (旧字体) and new form (新字体). var OldFormNewForm = []string{ - "\u4E9E", "\u4E9C", //亞, 亜 - "\u60E1", "\u60AA", //惡, 悪 - "\u58D3", "\u5727", //壓, 圧 - "\u570D", "\u56F2", //圍, 囲 - "\u7232", "\u70BA", //爲, 為 - "\u91AB", "\u533B", //醫, 医 - "\u58F9", "\u58F1", //壹, 壱 - "\uFA67", "\u9038", //逸, 逸 - "\u7A3B", "\u7A32", //稻, 稲 - "\u96B1", "\u96A0", //隱, 隠 - "\u71DF", "\u55B6", //營, 営 - "\u69AE", "\u6804", //榮, 栄 - "\u885E", "\u885B", //衞, 衛 - "\u9A5B", "\u99C5", //驛, 駅 - "\uFA62", "\u8B01", //謁, 謁 - "\u5713", "\u5186", //圓, 円 - "\u7DE3", "\u7E01", //緣, 縁 - "\u8277", "\u8276", //艷, 艶 - "\u9E7D", "\u5869", //鹽, 塩 - "\u5967", "\u5965", //奧, 奥 - "\u61C9", "\u5FDC", //應, 応 - "\u6A6B", "\u6A2A", //橫, 横 - "\u6B50", "\u6B27", //歐, 欧 - "\u6BC6", "\u6BB4", //毆, 殴 - "\u9EC3", "\u9EC4", //黃, 黄 - "\u6EAB", "\u6E29", //溫, 温 - "\u7A69", "\u7A4F", //穩, 穏 - "\u5047", "\u4EEE", //假, 仮 - "\u50F9", "\u4FA1", //價, 価 - "\uFA52", "\u798D", //禍, 禍 - "\u756B", "\u753B", //畫, 画 - "\u6703", "\u4F1A", //會, 会 - "\u58DE", "\u58CA", //壞, 壊 - "\uFA3D", "\u6094", //悔, 悔 - "\u61F7", "\u61D0", //懷, 懐 - "\uFA45", "\u6D77", //海, 海 - "\u7E6A", "\u7D75", //繪, 絵 - "\uFA3E", "\u6168", //慨, 慨 - "\u69EA", "\u6982", //槪, 概 - "\u64F4", "\u62E1", //擴, 拡 - "\u6BBC", "\u6BBB", //殼, 殻 - "\u89BA", "\u899A", //覺, 覚 - "\u5B78", "\u5B66", //學, 学 - "\u5DBD", "\u5CB3", //嶽, 岳 - "\u6A02", "\u697D", //樂, 楽 - "\uFA36", "\u559D", //喝, 喝 - "\u6E34", "\u6E07", //渴, 渇 - "\uFA60", "\u8910", //褐, 褐 - "\u52F8", "\u52E7", //勸, 勧 - "\u5377", "\u5DFB", //卷, 巻 - "\u5BEC", "\u5BDB", //寬, 寛 - "\u6B61", "\u6B53", //歡, 歓 - "\uFA47", "\u6F22", //漢, 漢 - "\u7F50", "\u7F36", //罐, 缶 - "\u89C0", "\u89B3", //觀, 観 - "\u95DC", "\u95A2", //關, 関 - "\u9677", "\u9665", //陷, 陥 - "\uFA38", "\u5668", //器, 器 - "\uFA42", "\u65E2", //既, 既 - "\u6B78", "\u5E30", //歸, 帰 - "\u6C23", "\u6C17", //氣, 気 - "\uFA4E", "\u7948", //祈, 祈 - "\u9F9C", "\u4E80", //龜, 亀 - "\u50DE", "\u507D", //僞, 偽 - "\u6232", "\u622F", //戲, 戯 - "\u72A7", "\u72A0", //犧, 犠 - "\u820A", "\u65E7", //舊, 旧 - "\u64DA", "\u62E0", //據, 拠 - "\u64E7", "\u6319", //擧, 挙 - "\u865B", "\u865A", //虛, 虚 - "\u5CFD", "\u5CE1", //峽, 峡 - "\u633E", "\u631F", //挾, 挟 - "\u72F9", "\u72ED", //狹, 狭 - "\u9115", "\u90F7", //鄕, 郷 - "\uFA69", "\u97FF", //響, 響 - "\u66C9", "\u6681", //曉, 暁 - "\uFA34", "\u52E4", //勤, 勤 - "\uFA63", "\u8B39", //謹, 謹 - "\u5340", "\u533A", //區, 区 - "\u9A45", "\u99C6", //驅, 駆 - "\u52F3", "\u52F2", //勳, 勲 - "\u85B0", "\u85AB", //薰, 薫 - "\u5F91", "\u5F84", //徑, 径 - "\u60E0", "\u6075", //惠, 恵 - "\u63ED", "\u63B2", //揭, 掲 - "\u6EAA", "\u6E13", //溪, 渓 - "\u7D93", "\u7D4C", //經, 経 - "\u7E7C", "\u7D99", //繼, 継 - "\u8396", "\u830E", //莖, 茎 - "\u87A2", "\u86CD", //螢, 蛍 - "\u8F15", "\u8EFD", //輕, 軽 - "\u9DC4", "\u9D8F", //鷄, 鶏 - "\u85DD", "\u82B8", //藝, 芸 - "\u64CA", "\u6483", //擊, 撃 - "\u7F3A", "\u6B20", //缺, 欠 - "\u5109", "\u5039", //儉, 倹 - "\u528D", "\u5263", //劍, 剣 - "\u5708", "\u570F", //圈, 圏 - "\u6AA2", "\u691C", //檢, 検 - "\u6B0A", "\u6A29", //權, 権 - "\u737B", "\u732E", //獻, 献 - "\u784F", "\u7814", //硏, 研 - "\u7E23", "\u770C", //縣, 県 - "\u96AA", "\u967A", //險, 険 - "\u986F", "\u9855", //顯, 顕 - "\u9A57", "\u9A13", //驗, 験 - "\u56B4", "\u53B3", //嚴, 厳 - "\u6548", "\u52B9", //效, 効 - "\u5EE3", "\u5E83", //廣, 広 - "\u6046", "\u6052", //恆, 恒 - "\u945B", "\u9271", //鑛, 鉱 - "\u865F", "\u53F7", //號, 号 - "\u570B", "\u56FD", //國, 国 - "\uFA54", "\u7A40", //穀, 穀 - "\u9ED1", "\u9ED2", //黑, 黒 - "\u6FDF", "\u6E08", //濟, 済 - "\u788E", "\u7815", //碎, 砕 - "\u9F4B", "\u658E", //齋, 斎 - "\u5291", "\u5264", //劑, 剤 - "\u6AFB", "\u685C", //櫻, 桜 - "\uF970", "\u6BBA", //殺, 殺 - "\u96DC", "\u96D1", //雜, 雑 - "\u53C3", "\u53C2", //參, 参 - "\u6158", "\u60E8", //慘, 惨 - "\u68E7", "\u685F", //棧, 桟 - "\u8836", "\u8695", //蠶, 蚕 - "\u8D0A", "\u8CDB", //贊, 賛 - "\u6B98", "\u6B8B", //殘, 残 - "\uFA4D", "\u7949", //祉, 祉 - "\u7D72", "\u7CF8", //絲, 糸 - "\uFA61", "\u8996", //視, 視 - "\u9F52", "\u6B6F", //齒, 歯 - "\u5152", "\u5150", //兒, 児 - "\u8FAD", "\u8F9E", //辭, 辞 - "\u6FD5", "\u6E7F", //濕, 湿 - "\u5BE6", "\u5B9F", //實, 実 - "\u5BEB", "\u5199", //寫, 写 - "\uFA48", "\u716E", //煮, 煮 - "\uFA4C", "\u793E", //社, 社 - "\uFA5B", "\u8005", //者, 者 - "\u91CB", "\u91C8", //釋, 釈 - "\u58FD", "\u5BFF", //壽, 寿 - "\u6536", "\u53CE", //收, 収 - "\uFA5C", "\u81ED", //臭, 臭 - "\u5F9E", "\u5F93", //從, 従 - "\u6F81", "\u6E0B", //澁, 渋 - "\u7378", "\u7363", //獸, 獣 - "\u7E31", "\u7E26", //縱, 縦 - "\uFA51", "\u795D", //祝, 祝 - "\u8085", "\u7C9B", //肅, 粛 - "\u8655", "\u51E6", //處, 処 - "\uFA43", "\u6691", //暑, 暑 - "\u7DD6", "\u7DD2", //緖, 緒 - "\uFA5A", "\u7F72", //署, 署 - "\uFA22", "\u8AF8", //諸, 諸 - "\u654D", "\u53D9", //敍, 叙 - "\u596C", "\u5968", //奬, 奨 - "\u5C07", "\u5C06", //將, 将 - "\u6D89", "\u6E09", //涉, 渉 - "\u71D2", "\u713C", //燒, 焼 - "\uFA1A", "\u7965", //祥, 祥 - "\u7A31", "\u79F0", //稱, 称 - "\u8B49", "\u8A3C", //證, 証 - "\u4E58", "\u4E57", //乘, 乗 - "\u5269", "\u5270", //剩, 剰 - "\u58E4", "\u58CC", //壤, 壌 - "\u5B43", "\u5B22", //孃, 嬢 - "\u689D", "\u6761", //條, 条 - "\u6DE8", "\u6D44", //淨, 浄 - "\u72C0", "\u72B6", //狀, 状 - "\u758A", "\u7573", //疊, 畳 - "\u8B93", "\u8B72", //讓, 譲 - "\u91C0", "\u91B8", //釀, 醸 - "\u56D1", "\u5631", //囑, 嘱 - "\u89F8", "\u89E6", //觸, 触 - "\u5BE2", "\u5BDD", //寢, 寝 - "\u613C", "\u614E", //愼, 慎 - "\u771E", "\u771F", //眞, 真 - "\uFA19", "\u795E", //神, 神 - "\u76E1", "\u5C3D", //盡, 尽 - "\u5716", "\u56F3", //圖, 図 - "\u7CB9", "\u7C8B", //粹, 粋 - "\u9189", "\u9154", //醉, 酔 - "\u96A8", "\u968F", //隨, 随 - "\u9AD3", "\u9AC4", //髓, 髄 - "\u6578", "\u6570", //數, 数 - "\u6A1E", "\u67A2", //樞, 枢 - "\u7028", "\u702C", //瀨, 瀬 - "\u8072", "\u58F0", //聲, 声 - "\u975C", "\u9759", //靜, 静 - "\u9F4A", "\u6589", //齊, 斉 - "\u651D", "\u6442", //攝, 摂 - "\u7ACA", "\u7A83", //竊, 窃 - "\uFA56", "\u7BC0", //節, 節 - "\u5C08", "\u5C02", //專, 専 - "\u6230", "\u6226", //戰, 戦 - "\u6DFA", "\u6D45", //淺, 浅 - "\u6F5B", "\u6F5C", //潛, 潜 - "\u7E96", "\u7E4A", //纖, 繊 - "\u8E10", "\u8DF5", //踐, 践 - "\u9322", "\u92AD", //錢, 銭 - "\u79AA", "\u7985", //禪, 禅 - "\u66FE", "\u66FD", //曾, 曽 - "\uFA50", "\u7956", //祖, 祖 - "\uFA31", "\u50E7", //僧, 僧 - "\u96D9", "\u53CC", //雙, 双 - "\u58EF", "\u58EE", //壯, 壮 - "\uFA3B", "\u5C64", //層, 層 - "\u641C", "\u635C", //搜, 捜 - "\u63D2", "\u633F", //插, 挿 - "\u5DE2", "\u5DE3", //巢, 巣 - "\u722D", "\u4E89", //爭, 争 - "\u7626", "\u75E9", //瘦, 痩 - "\u7E3D", "\u7DCF", //總, 総 - "\u838A", "\u8358", //莊, 荘 - "\u88DD", "\u88C5", //裝, 装 - "\u9A37", "\u9A12", //騷, 騒 - "\u589E", "\u5897", //增, 増 - "\uFA3F", "\u618E", //憎, 憎 - "\u81DF", "\u81D3", //臟, 臓 - "\u85CF", "\u8535", //藏, 蔵 - "\uFA65", "\u8D08", //贈, 贈 - "\u537D", "\u5373", //卽, 即 - "\u5C6C", "\u5C5E", //屬, 属 - "\u7E8C", "\u7D9A", //續, 続 - "\u58AE", "\u5815", //墮, 堕 - "\u9AD4", "\u4F53", //體, 体 - "\u5C0D", "\u5BFE", //對, 対 - "\u5E36", "\u5E2F", //帶, 帯 - "\u6EEF", "\u6EDE", //滯, 滞 - "\u81FA", "\u53F0", //臺, 台 - "\u7027", "\u6EDD", //瀧, 滝 - "\u64C7", "\u629E", //擇, 択 - "\u6FA4", "\u6CA2", //澤, 沢 - "\u55AE", "\u5358", //單, 単 - "\uFA37", "\u5606", //嘆, 嘆 - "\u64D4", "\u62C5", //擔, 担 - "\u81BD", "\u80C6", //膽, 胆 - "\u5718", "\u56E3", //團, 団 - "\u5F48", "\u5F3E", //彈, 弾 - "\u65B7", "\u65AD", //斷, 断 - "\u7661", "\u75F4", //癡, 痴 - "\u9072", "\u9045", //遲, 遅 - "\u665D", "\u663C", //晝, 昼 - "\u87F2", "\u866B", //蟲, 虫 - "\u9444", "\u92F3", //鑄, 鋳 - "\uFA5F", "\u8457", //著, 著 - "\u5EF3", "\u5E81", //廳, 庁 - "\u5FB5", "\u5FB4", //徵, 徴 - "\uFA40", "\u61F2", //懲, 懲 - "\u807D", "\u8074", //聽, 聴 - "\u6555", "\u52C5", //敕, 勅 - "\u93AD", "\u93AE", //鎭, 鎮 - "\uFA10", "\u585A", //塚, 塚 - "\u905E", "\u9013", //遞, 逓 - "\u9435", "\u9244", //鐵, 鉄 - "\u8F49", "\u8EE2", //轉, 転 - "\u9EDE", "\u70B9", //點, 点 - "\u50B3", "\u4F1D", //傳, 伝 - "\uFA26", "\u90FD", //都, 都 - "\u9EE8", "\u515A", //黨, 党 - "\u76DC", "\u76D7", //盜, 盗 - "\u71C8", "\u706F", //燈, 灯 - "\u7576", "\u5F53", //當, 当 - "\u9B2D", "\u95D8", //鬭, 闘 - "\u5FB7", "\u5FB3", //德, 徳 - "\u7368", "\u72EC", //獨, 独 - "\u8B80", "\u8AAD", //讀, 読 - "\uFA55", "\u7A81", //突, 突 - "\u5C46", "\u5C4A", //屆, 届 - "\u7E69", "\u7E04", //繩, 縄 - "\uFA68", "\u96E3", //難, 難 - "\u8CB3", "\u5F10", //貳, 弐 - "\u60F1", "\u60A9", //惱, 悩 - "\u8166", "\u8133", //腦, 脳 - "\u9738", "\u8987", //霸, 覇 - "\u5EE2", "\u5EC3", //廢, 廃 - "\u62DC", "\u62DD", //拜, 拝 - "\uFA44", "\u6885", //梅, 梅 - "\u8CE3", "\u58F2", //賣, 売 - "\u9EA5", "\u9EA6", //麥, 麦 - "\u767C", "\u767A", //發, 発 - "\u9AEE", "\u9AEA", //髮, 髪 - "\u62D4", "\u629C", //拔, 抜 - "\uFA59", "\u7E41", //繁, 繁 - "\u665A", "\u6669", //晚, 晩 - "\u883B", "\u86EE", //蠻, 蛮 - "\uFA35", "\u5351", //卑, 卑 - "\uFA4B", "\u7891", //碑, 碑 - "\u7955", "\u79D8", //祕, 秘 - "\u6FF1", "\u6D5C", //濱, 浜 - "\uFA64", "\u8CD3", //賓, 賓 - "\uFA6A", "\u983B", //頻, 頻 - "\uFA41", "\u654F", //敏, 敏 - "\u7501", "\u74F6", //甁, 瓶 - "\uFA30", "\u4FAE", //侮, 侮 - "\uFA1B", "\u798F", //福, 福 - "\u62C2", "\u6255", //拂, 払 - "\u4F5B", "\u4ECF", //佛, 仏 - "\u5002", "\u4F75", //倂, 併 - "\uFA39", "\u5840", //塀, 塀 - "\u7ADD", "\u4E26", //竝, 並 - "\u8B8A", "\u5909", //變, 変 - "\u908A", "\u8FBA", //邊, 辺 - "\uFA33", "\u52C9", //勉, 勉 - "\u8FA8", "\u5F01", //辨, 弁 - "\u74E3", "\u5F01", //瓣, 弁 - "\u8FAF", "\u5F01", //辯, 弁 - "\u6B65", "\u6B69", //步, 歩 - "\u7A57", "\u7A42", //穗, 穂 - "\u5BF6", "\u5B9D", //寶, 宝 - "\u8943", "\u8912", //襃, 褒 - "\u8C50", "\u8C4A", //豐, 豊 - "\uFA3A", "\u58A8", //墨, 墨 - "\u98DC", "\u7FFB", //飜, 翻 - "\u6BCF", "\u6BCE", //每, 毎 - "\u842C", "\u4E07", //萬, 万 - "\u6EFF", "\u6E80", //滿, 満 - "\uFA32", "\u514D", //免, 免 - "\u9EB5", "\u9EBA", //麵, 麺 - "\u9ED8", "\u9ED9", //默, 黙 - "\u9920", "\u9905", //餠, 餅 - "\u623E", "\u623B", //戾, 戻 - "\u5F4C", "\u5F25", //彌, 弥 - "\u85E5", "\u85AC", //藥, 薬 - "\u8B6F", "\u8A33", //譯, 訳 - "\u8C6B", "\u4E88", //豫, 予 - "\u9918", "\u4F59", //餘, 余 - "\u8207", "\u4E0E", //與, 与 - "\u8B7D", "\u8A89", //譽, 誉 - "\u6416", "\u63FA", //搖, 揺 - "\u6A23", "\u69D8", //樣, 様 - "\u8B20", "\u8B21", //謠, 謡 - "\u4F86", "\u6765", //來, 来 - "\u8CF4", "\u983C", //賴, 頼 - "\u4E82", "\u4E71", //亂, 乱 - "\uF91D", "\u6B04", //欄, 欄 - "\u89BD", "\u89A7", //覽, 覧 - "\uF9DC", "\u9686", //隆, 隆 - "\u9F8D", "\u7ADC", //龍, 竜 - "\uF936", "\u865C", //虜, 虜 - "\u5169", "\u4E21", //兩, 両 - "\u7375", "\u731F", //獵, 猟 - "\u7DA0", "\u7DD1", //綠, 緑 - "\u58D8", "\u5841", //壘, 塁 - "\u6DDA", "\u6D99", //淚, 涙 - "\uF9D0", "\u985E", //類, 類 - "\u52F5", "\u52B1", //勵, 励 - "\u79AE", "\u793C", //禮, 礼 - "\u9748", "\u970A", //靈, 霊 - "\u9F61", "\u9F62", //齡, 齢 - "\u66C6", "\u66A6", //曆, 暦 - "\u6B77", "\u6B74", //歷, 歴 - "\u6200", "\u604B", //戀, 恋 - "\uFA57", "\u7DF4", //練, 練 - "\u934A", "\u932C", //鍊, 錬 - "\u7210", "\u7089", //爐, 炉 - "\u52DE", "\u52B4", //勞, 労 - "\uF928", "\u5ECA", //廊, 廊 - "\uF929", "\u6717", //朗, 朗 - "\u6A13", "\u697C", //樓, 楼 - "\u90DE", "\u90CE", //郞, 郎 - "\u9304", "\u9332", //錄, 録 - "\u7063", "\u6E7E", //灣, 湾 + "\u4E9E", "\u4E9C", // 亞, 亜 + "\u60E1", "\u60AA", // 惡, 悪 + "\u58D3", "\u5727", // 壓, 圧 + "\u570D", "\u56F2", // 圍, 囲 + "\u7232", "\u70BA", // 爲, 為 + "\u91AB", "\u533B", // 醫, 医 + "\u58F9", "\u58F1", // 壹, 壱 + "\uFA67", "\u9038", // 逸, 逸 + "\u7A3B", "\u7A32", // 稻, 稲 + "\u96B1", "\u96A0", // 隱, 隠 + "\u71DF", "\u55B6", // 營, 営 + "\u69AE", "\u6804", // 榮, 栄 + "\u885E", "\u885B", // 衞, 衛 + "\u9A5B", "\u99C5", // 驛, 駅 + "\uFA62", "\u8B01", // 謁, 謁 + "\u5713", "\u5186", // 圓, 円 + "\u7DE3", "\u7E01", // 緣, 縁 + "\u8277", "\u8276", // 艷, 艶 + "\u9E7D", "\u5869", // 鹽, 塩 + "\u5967", "\u5965", // 奧, 奥 + "\u61C9", "\u5FDC", // 應, 応 + "\u6A6B", "\u6A2A", // 橫, 横 + "\u6B50", "\u6B27", // 歐, 欧 + "\u6BC6", "\u6BB4", // 毆, 殴 + "\u9EC3", "\u9EC4", // 黃, 黄 + "\u6EAB", "\u6E29", // 溫, 温 + "\u7A69", "\u7A4F", // 穩, 穏 + "\u5047", "\u4EEE", // 假, 仮 + "\u50F9", "\u4FA1", // 價, 価 + "\uFA52", "\u798D", // 禍, 禍 + "\u756B", "\u753B", // 畫, 画 + "\u6703", "\u4F1A", // 會, 会 + "\u58DE", "\u58CA", // 壞, 壊 + "\uFA3D", "\u6094", // 悔, 悔 + "\u61F7", "\u61D0", // 懷, 懐 + "\uFA45", "\u6D77", // 海, 海 + "\u7E6A", "\u7D75", // 繪, 絵 + "\uFA3E", "\u6168", // 慨, 慨 + "\u69EA", "\u6982", // 槪, 概 + "\u64F4", "\u62E1", // 擴, 拡 + "\u6BBC", "\u6BBB", // 殼, 殻 + "\u89BA", "\u899A", // 覺, 覚 + "\u5B78", "\u5B66", // 學, 学 + "\u5DBD", "\u5CB3", // 嶽, 岳 + "\u6A02", "\u697D", // 樂, 楽 + "\uFA36", "\u559D", // 喝, 喝 + "\u6E34", "\u6E07", // 渴, 渇 + "\uFA60", "\u8910", // 褐, 褐 + "\u52F8", "\u52E7", // 勸, 勧 + "\u5377", "\u5DFB", // 卷, 巻 + "\u5BEC", "\u5BDB", // 寬, 寛 + "\u6B61", "\u6B53", // 歡, 歓 + "\uFA47", "\u6F22", // 漢, 漢 + "\u7F50", "\u7F36", // 罐, 缶 + "\u89C0", "\u89B3", // 觀, 観 + "\u95DC", "\u95A2", // 關, 関 + "\u9677", "\u9665", // 陷, 陥 + "\uFA38", "\u5668", // 器, 器 + "\uFA42", "\u65E2", // 既, 既 + "\u6B78", "\u5E30", // 歸, 帰 + "\u6C23", "\u6C17", // 氣, 気 + "\uFA4E", "\u7948", // 祈, 祈 + "\u9F9C", "\u4E80", // 龜, 亀 + "\u50DE", "\u507D", // 僞, 偽 + "\u6232", "\u622F", // 戲, 戯 + "\u72A7", "\u72A0", // 犧, 犠 + "\u820A", "\u65E7", // 舊, 旧 + "\u64DA", "\u62E0", // 據, 拠 + "\u64E7", "\u6319", // 擧, 挙 + "\u865B", "\u865A", // 虛, 虚 + "\u5CFD", "\u5CE1", // 峽, 峡 + "\u633E", "\u631F", // 挾, 挟 + "\u72F9", "\u72ED", // 狹, 狭 + "\u9115", "\u90F7", // 鄕, 郷 + "\uFA69", "\u97FF", // 響, 響 + "\u66C9", "\u6681", // 曉, 暁 + "\uFA34", "\u52E4", // 勤, 勤 + "\uFA63", "\u8B39", // 謹, 謹 + "\u5340", "\u533A", // 區, 区 + "\u9A45", "\u99C6", // 驅, 駆 + "\u52F3", "\u52F2", // 勳, 勲 + "\u85B0", "\u85AB", // 薰, 薫 + "\u5F91", "\u5F84", // 徑, 径 + "\u60E0", "\u6075", // 惠, 恵 + "\u63ED", "\u63B2", // 揭, 掲 + "\u6EAA", "\u6E13", // 溪, 渓 + "\u7D93", "\u7D4C", // 經, 経 + "\u7E7C", "\u7D99", // 繼, 継 + "\u8396", "\u830E", // 莖, 茎 + "\u87A2", "\u86CD", // 螢, 蛍 + "\u8F15", "\u8EFD", // 輕, 軽 + "\u9DC4", "\u9D8F", // 鷄, 鶏 + "\u85DD", "\u82B8", // 藝, 芸 + "\u64CA", "\u6483", // 擊, 撃 + "\u7F3A", "\u6B20", // 缺, 欠 + "\u5109", "\u5039", // 儉, 倹 + "\u528D", "\u5263", // 劍, 剣 + "\u5708", "\u570F", // 圈, 圏 + "\u6AA2", "\u691C", // 檢, 検 + "\u6B0A", "\u6A29", // 權, 権 + "\u737B", "\u732E", // 獻, 献 + "\u784F", "\u7814", // 硏, 研 + "\u7E23", "\u770C", // 縣, 県 + "\u96AA", "\u967A", // 險, 険 + "\u986F", "\u9855", // 顯, 顕 + "\u9A57", "\u9A13", // 驗, 験 + "\u56B4", "\u53B3", // 嚴, 厳 + "\u6548", "\u52B9", // 效, 効 + "\u5EE3", "\u5E83", // 廣, 広 + "\u6046", "\u6052", // 恆, 恒 + "\u945B", "\u9271", // 鑛, 鉱 + "\u865F", "\u53F7", // 號, 号 + "\u570B", "\u56FD", // 國, 国 + "\uFA54", "\u7A40", // 穀, 穀 + "\u9ED1", "\u9ED2", // 黑, 黒 + "\u6FDF", "\u6E08", // 濟, 済 + "\u788E", "\u7815", // 碎, 砕 + "\u9F4B", "\u658E", // 齋, 斎 + "\u5291", "\u5264", // 劑, 剤 + "\u6AFB", "\u685C", // 櫻, 桜 + "\uF970", "\u6BBA", // 殺, 殺 + "\u96DC", "\u96D1", // 雜, 雑 + "\u53C3", "\u53C2", // 參, 参 + "\u6158", "\u60E8", // 慘, 惨 + "\u68E7", "\u685F", // 棧, 桟 + "\u8836", "\u8695", // 蠶, 蚕 + "\u8D0A", "\u8CDB", // 贊, 賛 + "\u6B98", "\u6B8B", // 殘, 残 + "\uFA4D", "\u7949", // 祉, 祉 + "\u7D72", "\u7CF8", // 絲, 糸 + "\uFA61", "\u8996", // 視, 視 + "\u9F52", "\u6B6F", // 齒, 歯 + "\u5152", "\u5150", // 兒, 児 + "\u8FAD", "\u8F9E", // 辭, 辞 + "\u6FD5", "\u6E7F", // 濕, 湿 + "\u5BE6", "\u5B9F", // 實, 実 + "\u5BEB", "\u5199", // 寫, 写 + "\uFA48", "\u716E", // 煮, 煮 + "\uFA4C", "\u793E", // 社, 社 + "\uFA5B", "\u8005", // 者, 者 + "\u91CB", "\u91C8", // 釋, 釈 + "\u58FD", "\u5BFF", // 壽, 寿 + "\u6536", "\u53CE", // 收, 収 + "\uFA5C", "\u81ED", // 臭, 臭 + "\u5F9E", "\u5F93", // 從, 従 + "\u6F81", "\u6E0B", // 澁, 渋 + "\u7378", "\u7363", // 獸, 獣 + "\u7E31", "\u7E26", // 縱, 縦 + "\uFA51", "\u795D", // 祝, 祝 + "\u8085", "\u7C9B", // 肅, 粛 + "\u8655", "\u51E6", // 處, 処 + "\uFA43", "\u6691", // 暑, 暑 + "\u7DD6", "\u7DD2", // 緖, 緒 + "\uFA5A", "\u7F72", // 署, 署 + "\uFA22", "\u8AF8", // 諸, 諸 + "\u654D", "\u53D9", // 敍, 叙 + "\u596C", "\u5968", // 奬, 奨 + "\u5C07", "\u5C06", // 將, 将 + "\u6D89", "\u6E09", // 涉, 渉 + "\u71D2", "\u713C", // 燒, 焼 + "\uFA1A", "\u7965", // 祥, 祥 + "\u7A31", "\u79F0", // 稱, 称 + "\u8B49", "\u8A3C", // 證, 証 + "\u4E58", "\u4E57", // 乘, 乗 + "\u5269", "\u5270", // 剩, 剰 + "\u58E4", "\u58CC", // 壤, 壌 + "\u5B43", "\u5B22", // 孃, 嬢 + "\u689D", "\u6761", // 條, 条 + "\u6DE8", "\u6D44", // 淨, 浄 + "\u72C0", "\u72B6", // 狀, 状 + "\u758A", "\u7573", // 疊, 畳 + "\u8B93", "\u8B72", // 讓, 譲 + "\u91C0", "\u91B8", // 釀, 醸 + "\u56D1", "\u5631", // 囑, 嘱 + "\u89F8", "\u89E6", // 觸, 触 + "\u5BE2", "\u5BDD", // 寢, 寝 + "\u613C", "\u614E", // 愼, 慎 + "\u771E", "\u771F", // 眞, 真 + "\uFA19", "\u795E", // 神, 神 + "\u76E1", "\u5C3D", // 盡, 尽 + "\u5716", "\u56F3", // 圖, 図 + "\u7CB9", "\u7C8B", // 粹, 粋 + "\u9189", "\u9154", // 醉, 酔 + "\u96A8", "\u968F", // 隨, 随 + "\u9AD3", "\u9AC4", // 髓, 髄 + "\u6578", "\u6570", // 數, 数 + "\u6A1E", "\u67A2", // 樞, 枢 + "\u7028", "\u702C", // 瀨, 瀬 + "\u8072", "\u58F0", // 聲, 声 + "\u975C", "\u9759", // 靜, 静 + "\u9F4A", "\u6589", // 齊, 斉 + "\u651D", "\u6442", // 攝, 摂 + "\u7ACA", "\u7A83", // 竊, 窃 + "\uFA56", "\u7BC0", // 節, 節 + "\u5C08", "\u5C02", // 專, 専 + "\u6230", "\u6226", // 戰, 戦 + "\u6DFA", "\u6D45", // 淺, 浅 + "\u6F5B", "\u6F5C", // 潛, 潜 + "\u7E96", "\u7E4A", // 纖, 繊 + "\u8E10", "\u8DF5", // 踐, 践 + "\u9322", "\u92AD", // 錢, 銭 + "\u79AA", "\u7985", // 禪, 禅 + "\u66FE", "\u66FD", // 曾, 曽 + "\uFA50", "\u7956", // 祖, 祖 + "\uFA31", "\u50E7", // 僧, 僧 + "\u96D9", "\u53CC", // 雙, 双 + "\u58EF", "\u58EE", // 壯, 壮 + "\uFA3B", "\u5C64", // 層, 層 + "\u641C", "\u635C", // 搜, 捜 + "\u63D2", "\u633F", // 插, 挿 + "\u5DE2", "\u5DE3", // 巢, 巣 + "\u722D", "\u4E89", // 爭, 争 + "\u7626", "\u75E9", // 瘦, 痩 + "\u7E3D", "\u7DCF", // 總, 総 + "\u838A", "\u8358", // 莊, 荘 + "\u88DD", "\u88C5", // 裝, 装 + "\u9A37", "\u9A12", // 騷, 騒 + "\u589E", "\u5897", // 增, 増 + "\uFA3F", "\u618E", // 憎, 憎 + "\u81DF", "\u81D3", // 臟, 臓 + "\u85CF", "\u8535", // 藏, 蔵 + "\uFA65", "\u8D08", // 贈, 贈 + "\u537D", "\u5373", // 卽, 即 + "\u5C6C", "\u5C5E", // 屬, 属 + "\u7E8C", "\u7D9A", // 續, 続 + "\u58AE", "\u5815", // 墮, 堕 + "\u9AD4", "\u4F53", // 體, 体 + "\u5C0D", "\u5BFE", // 對, 対 + "\u5E36", "\u5E2F", // 帶, 帯 + "\u6EEF", "\u6EDE", // 滯, 滞 + "\u81FA", "\u53F0", // 臺, 台 + "\u7027", "\u6EDD", // 瀧, 滝 + "\u64C7", "\u629E", // 擇, 択 + "\u6FA4", "\u6CA2", // 澤, 沢 + "\u55AE", "\u5358", // 單, 単 + "\uFA37", "\u5606", // 嘆, 嘆 + "\u64D4", "\u62C5", // 擔, 担 + "\u81BD", "\u80C6", // 膽, 胆 + "\u5718", "\u56E3", // 團, 団 + "\u5F48", "\u5F3E", // 彈, 弾 + "\u65B7", "\u65AD", // 斷, 断 + "\u7661", "\u75F4", // 癡, 痴 + "\u9072", "\u9045", // 遲, 遅 + "\u665D", "\u663C", // 晝, 昼 + "\u87F2", "\u866B", // 蟲, 虫 + "\u9444", "\u92F3", // 鑄, 鋳 + "\uFA5F", "\u8457", // 著, 著 + "\u5EF3", "\u5E81", // 廳, 庁 + "\u5FB5", "\u5FB4", // 徵, 徴 + "\uFA40", "\u61F2", // 懲, 懲 + "\u807D", "\u8074", // 聽, 聴 + "\u6555", "\u52C5", // 敕, 勅 + "\u93AD", "\u93AE", // 鎭, 鎮 + "\uFA10", "\u585A", // 塚, 塚 + "\u905E", "\u9013", // 遞, 逓 + "\u9435", "\u9244", // 鐵, 鉄 + "\u8F49", "\u8EE2", // 轉, 転 + "\u9EDE", "\u70B9", // 點, 点 + "\u50B3", "\u4F1D", // 傳, 伝 + "\uFA26", "\u90FD", // 都, 都 + "\u9EE8", "\u515A", // 黨, 党 + "\u76DC", "\u76D7", // 盜, 盗 + "\u71C8", "\u706F", // 燈, 灯 + "\u7576", "\u5F53", // 當, 当 + "\u9B2D", "\u95D8", // 鬭, 闘 + "\u5FB7", "\u5FB3", // 德, 徳 + "\u7368", "\u72EC", // 獨, 独 + "\u8B80", "\u8AAD", // 讀, 読 + "\uFA55", "\u7A81", // 突, 突 + "\u5C46", "\u5C4A", // 屆, 届 + "\u7E69", "\u7E04", // 繩, 縄 + "\uFA68", "\u96E3", // 難, 難 + "\u8CB3", "\u5F10", // 貳, 弐 + "\u60F1", "\u60A9", // 惱, 悩 + "\u8166", "\u8133", // 腦, 脳 + "\u9738", "\u8987", // 霸, 覇 + "\u5EE2", "\u5EC3", // 廢, 廃 + "\u62DC", "\u62DD", // 拜, 拝 + "\uFA44", "\u6885", // 梅, 梅 + "\u8CE3", "\u58F2", // 賣, 売 + "\u9EA5", "\u9EA6", // 麥, 麦 + "\u767C", "\u767A", // 發, 発 + "\u9AEE", "\u9AEA", // 髮, 髪 + "\u62D4", "\u629C", // 拔, 抜 + "\uFA59", "\u7E41", // 繁, 繁 + "\u665A", "\u6669", // 晚, 晩 + "\u883B", "\u86EE", // 蠻, 蛮 + "\uFA35", "\u5351", // 卑, 卑 + "\uFA4B", "\u7891", // 碑, 碑 + "\u7955", "\u79D8", // 祕, 秘 + "\u6FF1", "\u6D5C", // 濱, 浜 + "\uFA64", "\u8CD3", // 賓, 賓 + "\uFA6A", "\u983B", // 頻, 頻 + "\uFA41", "\u654F", // 敏, 敏 + "\u7501", "\u74F6", // 甁, 瓶 + "\uFA30", "\u4FAE", // 侮, 侮 + "\uFA1B", "\u798F", // 福, 福 + "\u62C2", "\u6255", // 拂, 払 + "\u4F5B", "\u4ECF", // 佛, 仏 + "\u5002", "\u4F75", // 倂, 併 + "\uFA39", "\u5840", // 塀, 塀 + "\u7ADD", "\u4E26", // 竝, 並 + "\u8B8A", "\u5909", // 變, 変 + "\u908A", "\u8FBA", // 邊, 辺 + "\uFA33", "\u52C9", // 勉, 勉 + "\u8FA8", "\u5F01", // 辨, 弁 + "\u74E3", "\u5F01", // 瓣, 弁 + "\u8FAF", "\u5F01", // 辯, 弁 + "\u6B65", "\u6B69", // 步, 歩 + "\u7A57", "\u7A42", // 穗, 穂 + "\u5BF6", "\u5B9D", // 寶, 宝 + "\u8943", "\u8912", // 襃, 褒 + "\u8C50", "\u8C4A", // 豐, 豊 + "\uFA3A", "\u58A8", // 墨, 墨 + "\u98DC", "\u7FFB", // 飜, 翻 + "\u6BCF", "\u6BCE", // 每, 毎 + "\u842C", "\u4E07", // 萬, 万 + "\u6EFF", "\u6E80", // 滿, 満 + "\uFA32", "\u514D", // 免, 免 + "\u9EB5", "\u9EBA", // 麵, 麺 + "\u9ED8", "\u9ED9", // 默, 黙 + "\u9920", "\u9905", // 餠, 餅 + "\u623E", "\u623B", // 戾, 戻 + "\u5F4C", "\u5F25", // 彌, 弥 + "\u85E5", "\u85AC", // 藥, 薬 + "\u8B6F", "\u8A33", // 譯, 訳 + "\u8C6B", "\u4E88", // 豫, 予 + "\u9918", "\u4F59", // 餘, 余 + "\u8207", "\u4E0E", // 與, 与 + "\u8B7D", "\u8A89", // 譽, 誉 + "\u6416", "\u63FA", // 搖, 揺 + "\u6A23", "\u69D8", // 樣, 様 + "\u8B20", "\u8B21", // 謠, 謡 + "\u4F86", "\u6765", // 來, 来 + "\u8CF4", "\u983C", // 賴, 頼 + "\u4E82", "\u4E71", // 亂, 乱 + "\uF91D", "\u6B04", // 欄, 欄 + "\u89BD", "\u89A7", // 覽, 覧 + "\uF9DC", "\u9686", // 隆, 隆 + "\u9F8D", "\u7ADC", // 龍, 竜 + "\uF936", "\u865C", // 虜, 虜 + "\u5169", "\u4E21", // 兩, 両 + "\u7375", "\u731F", // 獵, 猟 + "\u7DA0", "\u7DD1", // 綠, 緑 + "\u58D8", "\u5841", // 壘, 塁 + "\u6DDA", "\u6D99", // 淚, 涙 + "\uF9D0", "\u985E", // 類, 類 + "\u52F5", "\u52B1", // 勵, 励 + "\u79AE", "\u793C", // 禮, 礼 + "\u9748", "\u970A", // 靈, 霊 + "\u9F61", "\u9F62", // 齡, 齢 + "\u66C6", "\u66A6", // 曆, 暦 + "\u6B77", "\u6B74", // 歷, 歴 + "\u6200", "\u604B", // 戀, 恋 + "\uFA57", "\u7DF4", // 練, 練 + "\u934A", "\u932C", // 鍊, 錬 + "\u7210", "\u7089", // 爐, 炉 + "\u52DE", "\u52B4", // 勞, 労 + "\uF928", "\u5ECA", // 廊, 廊 + "\uF929", "\u6717", // 朗, 朗 + "\u6A13", "\u697C", // 樓, 楼 + "\u90DE", "\u90CE", // 郞, 郎 + "\u9304", "\u9332", // 錄, 録 + "\u7063", "\u6E7E", // 灣, 湾 } diff --git a/tool/oldformtonewbuilder/main.go b/tool/oldformtonewbuilder/main.go index 248c8c9..37d8990 100644 --- a/tool/oldformtonewbuilder/main.go +++ b/tool/oldformtonewbuilder/main.go @@ -39,7 +39,7 @@ func run() error { if len(a) != 4 { return fmt.Errorf("invalid golden file format, line=%d, %s", line, l) } - b.WriteString(`"\u` + a[0] + `", "\u` + a[2] + `", //` + a[1] + ", " + a[3] + "\n") + b.WriteString(`"\u` + a[0] + `", "\u` + a[2] + `", // ` + a[1] + ", " + a[3] + "\n") } if err := s.Err(); err != nil { return err