test/examples/Residue.m17n in when_exe-0.4.1 vs test/examples/Residue.m17n in when_exe-0.4.2
- old
+ new
@@ -1,7 +1,7 @@
BEGIN:B:M17N
-# Copyright (C) 20112-13 Takashi SUGA
+# Copyright (C) 2012-2015 Takashi SUGA
#
# You may use and/or modify this file according to the license
# described in the LICENSE.txt file included in this archive.
NAMESPACE:[en=http://en.wikipedia.org/wiki/,
ja=http://ja.wikipedia.org/wiki/]
@@ -32,105 +32,105 @@
BEGIN:CO:RESIDUE
LABEL:[Stem, *干]
DIVISOR:10
DAY:11
YEAR:4
- CO:RESIDUE:0,10,0,[kinoe, *甲]
- CO:RESIDUE:1,10,0,[kinoto, *乙]
- CO:RESIDUE:2,10,0,[hinoe, *丙]
- CO:RESIDUE:3,10,0,[hinoto, *丁]
- CO:RESIDUE:4,10,0,[tsuchinoe, *戊]
- CO:RESIDUE:5,10,0,[tsuchinoto, *己]
- CO:RESIDUE:6,10,0,[kanoe, *庚]
- CO:RESIDUE:7,10,0,[kanoto, *辛]
- CO:RESIDUE:8,10,0,[mizunoe, *壬]
- CO:RESIDUE:9,10,0,[mizunoto, *癸]
+ CO:RESIDUE:0,10,0,[Wood-yang, *甲]
+ CO:RESIDUE:1,10,0,[Wood-yin, *乙]
+ CO:RESIDUE:2,10,0,[Fire-yang, *丙]
+ CO:RESIDUE:3,10,0,[Fire-yin, *丁]
+ CO:RESIDUE:4,10,0,[Erath-yang, *戊]
+ CO:RESIDUE:5,10,0,[Erath-yin, *己]
+ CO:RESIDUE:6,10,0,[Metal-yang, *庚]
+ CO:RESIDUE:7,10,0,[Metal-yin, *辛]
+ CO:RESIDUE:8,10,0,[Water-yang, *壬]
+ CO:RESIDUE:9,10,0,[Water-yin, *癸]
END:CO:RESIDUE
BEGIN:CO:RESIDUE
LABEL:[Branch, *支]
DIVISOR:12
DAY:11
YEAR:4
- CO:RESIDUE: 0,12,0,[ne, *子]
- CO:RESIDUE: 1,12,0,[ushi, *丑]
- CO:RESIDUE: 2,12,0,[tora, *寅]
- CO:RESIDUE: 3,12,0,[u, *卯]
- CO:RESIDUE: 4,12,0,[tatsu, *辰]
- CO:RESIDUE: 5,12,0,[mi, *巳]
- CO:RESIDUE: 6,12,0,[uma, *午]
- CO:RESIDUE: 7,12,0,[hitsuji, *未]
- CO:RESIDUE: 8,12,0,[saru, *申]
- CO:RESIDUE: 9,12,0,[tori, *酉]
- CO:RESIDUE:10,12,0,[inu, *戌]
- CO:RESIDUE:11,12,0,[i, *亥]
+ CO:RESIDUE: 0,12,0,[Rat, *子]
+ CO:RESIDUE: 1,12,0,[Ox, *丑]
+ CO:RESIDUE: 2,12,0,[Tiger, *寅]
+ CO:RESIDUE: 3,12,0,[Rabbit, *卯]
+ CO:RESIDUE: 4,12,0,[Dragon, *辰]
+ CO:RESIDUE: 5,12,0,[Snake, *巳]
+ CO:RESIDUE: 6,12,0,[Horse, *午]
+ CO:RESIDUE: 7,12,0,[Goat, *未]
+ CO:RESIDUE: 8,12,0,[Monkey, *申]
+ CO:RESIDUE: 9,12,0,[Rooster, *酉]
+ CO:RESIDUE:10,12,0,[Dog, *戌]
+ CO:RESIDUE:11,12,0,[Pig, *亥]
END:CO:RESIDUE
BEGIN:CO:RESIDUE
LABEL:[Stem-Branch, *干支]
DIVISOR:60
DAY:11
YEAR:4
- CO:RESIDUE: 0,60,0,[kinoe-ne, *甲子]
- CO:RESIDUE: 1,60,0,[kinoto-ushi, *乙丑]
- CO:RESIDUE: 2,60,0,[hinoe-tora, *丙寅]
- CO:RESIDUE: 3,60,0,[hinoto-u, *丁卯]
- CO:RESIDUE: 4,60,0,[tsuchinoe-tatsu, *戊辰]
- CO:RESIDUE: 5,60,0,[tsuchinoto-mi, *己巳]
- CO:RESIDUE: 6,60,0,[kanoe-uma, *庚午]
- CO:RESIDUE: 7,60,0,[kanoto-hitsuji, *辛未]
- CO:RESIDUE: 8,60,0,[mizunoe-saru, *壬申]
- CO:RESIDUE: 9,60,0,[mizunoto-tori, *癸酉]
- CO:RESIDUE:10,60,0,[kinoe-inu, *甲戌]
- CO:RESIDUE:11,60,0,[kinoto-i, *乙亥]
- CO:RESIDUE:12,60,0,[hinoe-ne, *丙子]
- CO:RESIDUE:13,60,0,[hinoto-ushi, *丁丑]
- CO:RESIDUE:14,60,0,[tsuchinoe-tora, *戊寅]
- CO:RESIDUE:15,60,0,[tsuchinoto-u, *己卯]
- CO:RESIDUE:16,60,0,[kanoe-tatsu, *庚辰]
- CO:RESIDUE:17,60,0,[kanoto-mi, *辛巳]
- CO:RESIDUE:18,60,0,[mizunoe-uma, *壬午]
- CO:RESIDUE:19,60,0,[mizunoto-hitsuji, *癸未]
- CO:RESIDUE:20,60,0,[kinoe-saru, *甲申]
- CO:RESIDUE:21,60,0,[kinoto-tori, *乙酉]
- CO:RESIDUE:22,60,0,[hinoe-inu, *丙戌]
- CO:RESIDUE:23,60,0,[hinoto-i, *丁亥]
- CO:RESIDUE:24,60,0,[tsuchinoe-ne, *戊子]
- CO:RESIDUE:25,60,0,[tsuchinoto-ushi, *己丑]
- CO:RESIDUE:26,60,0,[kanoe-tora, *庚寅]
- CO:RESIDUE:27,60,0,[kanoto-u, *辛卯]
- CO:RESIDUE:28,60,0,[mizunoe-tatsu, *壬辰]
- CO:RESIDUE:29,60,0,[mizunoto-mi, *癸巳]
- CO:RESIDUE:30,60,0,[kinoe-uma, *甲午]
- CO:RESIDUE:31,60,0,[kinoto-hitsuji, *乙未]
- CO:RESIDUE:32,60,0,[hinoe-saru, *丙申]
- CO:RESIDUE:33,60,0,[hinoto-tori, *丁酉]
- CO:RESIDUE:34,60,0,[tsuchinoe-inu, *戊戌]
- CO:RESIDUE:35,60,0,[tsuchinoto-i, *己亥]
- CO:RESIDUE:36,60,0,[kanoe-ne, *庚子]
- CO:RESIDUE:37,60,0,[kanoto-ushi, *辛丑]
- CO:RESIDUE:38,60,0,[mizunoe-tora, *壬寅]
- CO:RESIDUE:39,60,0,[mizunoto-u, *癸卯]
- CO:RESIDUE:40,60,0,[kinoe-tatsu, *甲辰]
- CO:RESIDUE:41,60,0,[kinoto-mi, *乙巳]
- CO:RESIDUE:42,60,0,[hinoe-uma, *丙午]
- CO:RESIDUE:43,60,0,[hinoto-hitsuji, *丁未]
- CO:RESIDUE:44,60,0,[tsuchinoe-saru, *戊申]
- CO:RESIDUE:45,60,0,[tsuchinoto-tori, *己酉]
- CO:RESIDUE:46,60,0,[kanoe-inu, *庚戌]
- CO:RESIDUE:47,60,0,[kanoto-i, *辛亥]
- CO:RESIDUE:48,60,0,[mizunoe-ne, *壬子]
- CO:RESIDUE:49,60,0,[mizunoto-ushi, *癸丑]
- CO:RESIDUE:50,60,0,[kinoe-tora, *甲寅]
- CO:RESIDUE:51,60,0,[kinoto-u, *乙卯]
- CO:RESIDUE:52,60,0,[hinoe-tatsu, *丙辰]
- CO:RESIDUE:53,60,0,[hinoto-mi, *丁巳]
- CO:RESIDUE:54,60,0,[tsuchinoe-uma, *戊午]
- CO:RESIDUE:55,60,0,[tsuchinoto-hitsuji, *己未]
- CO:RESIDUE:56,60,0,[kanoe-saru, *庚申]
- CO:RESIDUE:57,60,0,[kanoto-tori, *辛酉]
- CO:RESIDUE:58,60,0,[mizunoe-inu, *壬戌]
- CO:RESIDUE:59,60,0,[mizunoto-i, *癸亥]
+ CO:RESIDUE: 0,60,0,[Wood-yang-Rat, *甲子]
+ CO:RESIDUE: 1,60,0,[Wood-yin-Ox, *乙丑]
+ CO:RESIDUE: 2,60,0,[Fire-yang-Tiger, *丙寅]
+ CO:RESIDUE: 3,60,0,[Fire-yin-Rabbit, *丁卯]
+ CO:RESIDUE: 4,60,0,[Erath-yang-Dragon, *戊辰]
+ CO:RESIDUE: 5,60,0,[Erath-yin-Snake, *己巳]
+ CO:RESIDUE: 6,60,0,[Metal-yang-Horse, *庚午]
+ CO:RESIDUE: 7,60,0,[Metal-yin-Goat, *辛未]
+ CO:RESIDUE: 8,60,0,[Water-yang-Monkey, *壬申]
+ CO:RESIDUE: 9,60,0,[Water-yin-Rooster, *癸酉]
+ CO:RESIDUE:10,60,0,[Wood-yang-Dog, *甲戌]
+ CO:RESIDUE:11,60,0,[Wood-yin-Pig, *乙亥]
+ CO:RESIDUE:12,60,0,[Fire-yang-Rat, *丙子]
+ CO:RESIDUE:13,60,0,[Fire-yin-Ox, *丁丑]
+ CO:RESIDUE:14,60,0,[Erath-yang-Tiger, *戊寅]
+ CO:RESIDUE:15,60,0,[Erath-yin-Rabbit, *己卯]
+ CO:RESIDUE:16,60,0,[Metal-yang-Dragon, *庚辰]
+ CO:RESIDUE:17,60,0,[Metal-yin-Snake, *辛巳]
+ CO:RESIDUE:18,60,0,[Water-yang-Horse, *壬午]
+ CO:RESIDUE:19,60,0,[Water-yin-Goat, *癸未]
+ CO:RESIDUE:20,60,0,[Wood-yang-Monkey, *甲申]
+ CO:RESIDUE:21,60,0,[Wood-yin-Rooster, *乙酉]
+ CO:RESIDUE:22,60,0,[Fire-yang-Dog, *丙戌]
+ CO:RESIDUE:23,60,0,[Fire-yin-Pig, *丁亥]
+ CO:RESIDUE:24,60,0,[Erath-yang-Rat, *戊子]
+ CO:RESIDUE:25,60,0,[Erath-yin-Ox, *己丑]
+ CO:RESIDUE:26,60,0,[Metal-yang-Tiger, *庚寅]
+ CO:RESIDUE:27,60,0,[Metal-yin-Rabbit, *辛卯]
+ CO:RESIDUE:28,60,0,[Water-yang-Dragon, *壬辰]
+ CO:RESIDUE:29,60,0,[Water-yin-Snake, *癸巳]
+ CO:RESIDUE:30,60,0,[Wood-yang-Horse, *甲午]
+ CO:RESIDUE:31,60,0,[Wood-yin-Goat, *乙未]
+ CO:RESIDUE:32,60,0,[Fire-yang-Monkey, *丙申]
+ CO:RESIDUE:33,60,0,[Fire-yin-Rooster, *丁酉]
+ CO:RESIDUE:34,60,0,[Erath-yang-Dog, *戊戌]
+ CO:RESIDUE:35,60,0,[Erath-yin-Pig, *己亥]
+ CO:RESIDUE:36,60,0,[Metal-yang-Rat, *庚子]
+ CO:RESIDUE:37,60,0,[Metal-yin-Ox, *辛丑]
+ CO:RESIDUE:38,60,0,[Water-yang-Tiger, *壬寅]
+ CO:RESIDUE:39,60,0,[Water-yin-Rabbit, *癸卯]
+ CO:RESIDUE:40,60,0,[Wood-yang-Dragon, *甲辰]
+ CO:RESIDUE:41,60,0,[Wood-yin-Snake, *乙巳]
+ CO:RESIDUE:42,60,0,[Fire-yang-Horse, *丙午]
+ CO:RESIDUE:43,60,0,[Fire-yin-Goat, *丁未]
+ CO:RESIDUE:44,60,0,[Erath-yang-Monkey, *戊申]
+ CO:RESIDUE:45,60,0,[Erath-yin-Rooster, *己酉]
+ CO:RESIDUE:46,60,0,[Metal-yang-Dog, *庚戌]
+ CO:RESIDUE:47,60,0,[Metal-yin-Pig, *辛亥]
+ CO:RESIDUE:48,60,0,[Water-yang-Rat, *壬子]
+ CO:RESIDUE:49,60,0,[Water-yin-Ox, *癸丑]
+ CO:RESIDUE:50,60,0,[Wood-yang-Tiger, *甲寅]
+ CO:RESIDUE:51,60,0,[Wood-yin-Rabbit, *乙卯]
+ CO:RESIDUE:52,60,0,[Fire-yang-Dragon, *丙辰]
+ CO:RESIDUE:53,60,0,[Fire-yin-Snake, *丁巳]
+ CO:RESIDUE:54,60,0,[Erath-yang-Horse, *戊午]
+ CO:RESIDUE:55,60,0,[Erath-yin-Goat, *己未]
+ CO:RESIDUE:56,60,0,[Metal-yang-Monkey, *庚申]
+ CO:RESIDUE:57,60,0,[Metal-yin-Rooster, *辛酉]
+ CO:RESIDUE:58,60,0,[Water-yang-Dog, *壬戌]
+ CO:RESIDUE:59,60,0,[Water-yin-Pig, *癸亥]
END:CO:RESIDUE
END:B:M17N