when_exe 0.4.1 → 0.4.2

data/lib/when_exe/tmposition.rb

@@ -314,11 +314,11 @@ module When::TM
                       gsub(When::Parts::Resource::IRIDecode) {|c| When::Parts::Resource::IRIDecodeTable[c]}
 
         # suffix - Frame specification
-        if iso8601form =~ /\A(.*[^\d])\((([-+*&%@!>=<?\dW.]|\{.+?\})+)\)\z/
+        if iso8601form =~ /\A(.*[^\d]|.+=[^:]+)\((([-+*&%@!>=<?\dW.T:]|\{.+?\})+)\)\z/
           frame, iso8601form = $~[1..2]
           frame.sub!(/_+\z/, '')
         else
-          iso8601form, frame, *rest = iso8601form.split(/\^{1,2}/)
+          iso8601form, frame, *rest = iso8601form.split(/(?:\^|%5E){1,2}/i)
           return rest.inject(_instance(iso8601form + '^' + frame, options)) {|p,c| When.Resource(c, '_c:').jul_trans(p)} unless rest.empty?
         end
 
@@ -326,7 +326,7 @@ module When::TM
         options = options.merge({:frame=>When.Resource(frame, '_c:')}) if frame
 
         # indeterminateValue
-        if (iso8601form.sub!(/\/After$|^Before\/|^Now$|^Unknown$|^[-+]Infinity\z/i, ''))
+        if (iso8601form.sub!(/\/After\z|\ABefore\/|\ANow\z|\AUnknown\z|\A[-+]Infinity\z/i, ''))
           options[:indeterminated_position] = When::TimeValue::S[$&.sub(/\//,'')]
           case options[:indeterminated_position]
           when When::TimeValue::Now,
@@ -505,7 +505,7 @@ module When::TM
         main[:clock] = clock if clock
         [:indeterminated_position, :frame, :events, :precision,
          :era_name, :era, :abbr, :extra_year_digits, :ordinal_date_digits, :wkst, :time_standard, :location].each do |key|
-          main[key] = query.delete(key) if (query.key?(key))
+          main[key] = query.delete(key) if query.key?(key)
         end
         long = query.delete(:long)
         lat  = query.delete(:lat)
@@ -538,7 +538,7 @@ module When::TM
 
         # PeriodDuration
         sign, *args = PeriodDuration._to_array(specification)
-        if (sign)
+        if sign
           args << options
           duration = PeriodDuration.new(*args)
           return (sign >= 0) ? duration : -duration
@@ -548,14 +548,14 @@ module When::TM
         specification =~ /(.+?)(?:\[([-+]?\d+)\])?\z/
         options[:sdn] = $2.to_i if $2
         f, d, t, z, e, r = When::BasicTypes::DateTime._to_array($1, options)
-        raise ArgumentError, "Timezone conflict: #{z} - #{options[:clock]}" if (z && options[:clock])
         options.delete(:abbr)
+        z2  = When.Clock(options[:clock]) if z && options[:clock]
         z ||= options[:clock]
-        z = When.Clock(z) if (z =~ /\A[A-Z]+\z/)
+        z   = When.Clock(z) if z =~ /\A[A-Z]+\z/
 
         unless d
           # ClockTime
-          raise ArgumentError, "Timezone conflict: #{z} - #{options[:clock]}" if (z && options[:frame])
+          raise ArgumentError, "Timezone conflict: #{z} - #{options[:clock]}" if z && options[:frame]
           options[:frame] ||= z
           options.delete(:clock)
           return ClockTime.new(t, options)
@@ -563,7 +563,7 @@ module When::TM
 
         options[:era_name] = e if e
         options[:_format ] = f if f
-        d, w = d[0..0], d[1..-1] if (f == :week || f == :day)
+        d, w = d[0..0], d[1..-1] if f == :week || f == :day
         position = z ? DateAndTime.new(d, t||[0], options.update({:clock => z})) :
                    t ? DateAndTime.new(d, t,      options)                       :
                        CalDate.new(d, options)
@@ -586,7 +586,7 @@ module When::TM
             position &= residue
           end
         end
-        return position
+        z2 ? z2 ^ position : position
       end
     end
 
@@ -703,14 +703,13 @@ module When::TM
 
     # 標準ライブラリの DateTime オブジェクトへの変換
     #
+    # @param [Integer] start ::DateTime オブジェクトのグレゴリオ改暦日(ユリウス通日)
     # @param [Hash] option  時間の歩度が1.0でない場合のための option
     #   see {When::TM::TemporalPosition._instance}
     #
-    # @param [Integer] start ::DateTime オブジェクトのグレゴリオ改暦日(ユリウス通日)
-    #
     # @return [::DateTime]
     #
-    def to_datetime(option={:frame=>When::UTC}, start=_default_start)
+    def to_datetime(start=_default_start, option={:frame=>When::UTC})
       return JulianDate.dynamical_time(dynamical_time, option).to_datetime unless time_standard.rate_of_clock == 1.0
       raise TypeError, "Clock not assigned" unless clock
       Rational
@@ -721,14 +720,13 @@ module When::TM
 
     # 標準ライブラリの Date オブジェクトへの変換
     #
+    # @param [Integer] start ::DateTime オブジェクトのグレゴリオ改暦日(ユリウス通日)
     # @param [Hash] option  時間の歩度が1.0でない場合のための option
     #   see {When::TM::TemporalPosition._instance}
     #
-    # @param [Integer] start ::DateTime オブジェクトのグレゴリオ改暦日(ユリウス通日)
-    #
     # @return [::Date]
     #
-    def to_date(option={}, start=_default_start)
+    def to_date(start=_default_start, option={})
       return JulianDate.dynamical_time(dynamical_time, option).to_date unless time_standard.rate_of_clock == 1.0
       ::Date.jd(to_i, start)
     end
@@ -1031,12 +1029,12 @@ module When::TM
     # 属性のコピー
     # @private
     def _copy(options={})
-      @frame         = options[:frame]         if (options.key?(:frame))
-      @events        = options[:events]        if (options.key?(:events))
-      @precision     = options[:precision]     if (options.key?(:precision))
-      @query         = options[:query]         if (options.key?(:query))
-      @location      = options[:location]      if (options.key?(:location))
-      @time_standard = options[:time_standard] if (options.key?(:time_standard))
+      @frame         = options[:frame]         if options.key?(:frame)
+      @events        = options[:events]        if options.key?(:events)
+      @precision     = options[:precision]     if options.key?(:precision)
+      @query         = options[:query]         if options.key?(:query)
+      @location      = options[:location]      if options.key?(:location)
+      @time_standard = options[:time_standard] if options.key?(:time_standard)
       @sdn = @universal_time = @local_time = @dynamical_time = @period = nil
       _normalize(options)
       return self
@@ -1403,7 +1401,7 @@ module When::TM
     #
     def initialize(universal_time, options={})
       @frame = options.delete(:frame)
-      @frame = When.Clock(@frame) if (@frame.kind_of?(String))
+      @frame = When.Clock(@frame) if @frame.kind_of?(String)
       @frame = @frame._daylight(universal_time) if @frame && @frame._need_validate
       precision    = options.delete(:precision)
       precision  ||= DAY unless @frame.kind_of?(Clock)
@@ -1517,9 +1515,12 @@ module When::TM
     # 属性のコピー
     # @private
     def _copy(options={})
-      @clk_time = options[:time]  if (options.key?(:time))
-      @frame    = options[:clock] if (options.key?(:clock))
-      if (options.key?(:tz_prop))
+      @clk_time = options[:time] if options.key?(:time)
+      if options.key?(:clock)
+        options.delete(:frame)
+        @frame  = options[:clock]
+      end
+      if options.key?(:tz_prop)
         @frame  = @frame.dup
         @frame.tz_prop = options[:tz_prop]
       end
@@ -1719,6 +1720,21 @@ module When::TM
                                                           'year' => most_significant_coordinate})
     end
 
+    # 暦年代の削除
+    #
+    # @return [When::TM::CalDate] 暦年代を削除した When::TM::CalDate
+    #
+    def without_era
+      target  = dup
+      return target unless calendar_era
+      options = _attr
+      options[:era]      = nil
+      options[:era_name] = nil
+      options[:date]     = cal_date.dup
+      options[:date][0] += calendar_era_epoch
+      target._copy(options)
+    end
+
     # 要素の参照
     #
     # @param [Integer, String] index 参照する要素の指定
@@ -1865,7 +1881,9 @@ module When::TM
     # 属性のコピー
     # @private
     def _copy(options={})
-      @cal_date = options[:date] if (options.key?(:date))
+      @cal_date           = options[:date]     if options.key?(:date)
+      @calendar_era       = options[:era]      if options.key?(:era)
+      @calendar_era_props = options[:era_name] if options.key?(:era_name)
       return super
     end
 
@@ -1909,7 +1927,7 @@ module When::TM
           era, date = _search_era(@calendar_era, trans_options)
         else
           eras = CalendarEra._instance(query_options)
-          raise ArgumentError, "CalendarEraName doesn't exist: #{query_options[:label]}" if (eras.size==0)
+          raise ArgumentError, "CalendarEraName doesn't exist: #{query_options[:label]}" if eras.empty?
           eras.each do |e|
             era, date = _search_era(e, trans_options)
             next unless era
@@ -1965,7 +1983,7 @@ module When::TM
           end
           era  = new_era
         when TimeValue
-          return era, date
+         return era, date
         else
           break
         end
@@ -2105,7 +2123,18 @@ module When::TM
     #
     def floor(digit=DAY, precision=digit)
       count    = digit - clock.indices.length
-      date     = (digit>=DAY) ? @cal_date.dup : @frame._validate(@cal_date[0..(digit-1)])
+
+      if digit>=DAY
+        date     = @cal_date.dup
+      elsif @calendar_era_props
+        date     = @cal_date.dup
+        date[0] += calendar_era_epoch
+        date     = @frame._validate(date[0..(digit-1)])
+        date[0] -= calendar_era_epoch
+      else
+        date     = @frame._validate(@cal_date[0..(digit-1)])
+      end
+
       time     = @clk_time.clk_time[0..((digit<=DAY) ? 0 : ((count>=0) ? -1 : digit))]
       time[0] += to_i
       time     = clock._validate(time)
@@ -2179,7 +2208,13 @@ module When::TM
       case options[:time]
       when Array
         if clock._need_validate
-          new_clock = clock._daylight([@frame, options[:date], options[:time]])
+          if @calendar_era_props
+            date     = options[:date].dup
+            date[0] += calendar_era_epoch
+          else
+            date     = options[:date]
+          end
+          new_clock = clock._daylight([@frame, date, options[:time]])
           options[:time] = options[:time].map {|t| t * 1}
         else
           new_clock = clock

data/lib/when_exe/version.rb

@@ -1,10 +1,24 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2013-2015 Takashi SUGA
+  Copyright (C) 2011-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.
 =end
 
 module When
-  VERSION = "0.4.1"
+  VERSION   = "0.4.2"
+  YEARS     = "(C) 2011-2015"
+  AUTHOR    = "Takashi SUGA"
+  COPYRIGHT = "#{YEARS} #{AUTHOR}"
+
+  class BasicTypes::M17n
+    Rights = [self, [
+      "locale:[=en:, ja=ja:, alias]",
+      "names:[Basic information=, 基本情報=, *alias:Rights=]",
+      "[#{YEARS}=, *alias:Years]",
+      "[#{AUTHOR}=http://hosi.org/TakashiSuga, 須賀 隆=, *alias:Author=]",
+      "[When.exe written in Ruby language=http://www2u.biglobe.ne.jp/~suchowan/when_exe_wiki.html,  When.exe Ruby版=,  *alias:Title=]",
+      "[Gem Ver. #{VERSION}=http://rubygems.org/gems/when_exe, *alias:Version=]"
+    ]]
+  end
 end

data/test/examples/Residue.m17n

@@ -1,5 +1,5 @@
 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.
@@ -34,16 +34,16 @@ BEGIN:B:M17N
     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
@@ -51,18 +51,18 @@ BEGIN:B:M17N
     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
 
 
@@ -71,66 +71,66 @@ BEGIN:B:M17N
     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