when_exe 0.4.2 → 0.5.0

data/lib/when_exe/region/japanese/epochs.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2021 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
@@ -335,7 +335,9 @@ module When
       ["[昭和,Shōwa=en:Sh%C5%8Dwa_period,S]1.12.25",    "@A",
 				"name=[昭和天皇,Emperor_Shōwa];1926-12-25"],
       ["[平成,Heisei=en:Heisei_period,H]1.01.08",       "@A",
-				"name=[今上天皇=ja:%%<明仁>,Emperor_Kinjō=en:Akihito];1989-01-08"]
+				"name=[上皇明仁,Emperor_Emeritus_of_Japan=en:Akihito];1989-01-08"],
+      ["[令和,Reiwa,R]1.05.01",       "@A",
+				"name=[今上天皇=ja:%%<徳仁>,Emperor_Kinjō=en:Naruhito];2019-05-01"]
     ]]
 
     #
@@ -403,7 +405,7 @@ module When
       ["[鈴木善幸]1.07.17",				"@A", "1980-07-17"],
       ["[中曽根康弘]1.11.27",				"@A", "1982-11-27"],
       ["[竹下登]1.11.06",				"@A", "1987-11-06",
-      	 "name=[今上天皇=ja:%%<明仁>,Emperor_Kinjō=en:Akihito];1989-01-08", ""],
+      	 "name=[上皇明仁,Emperor_Emeritus_of_Japan=en:Akihito];1989-01-08", ""],
       ["[宇野宗佑]1.06.03",				"@A", "1989-06-03"],
       ["[海部俊樹]1.08.10",				"@A", "1989-08-10"],
       ["[宮沢喜一]1.11.05",				"@A", "1991-11-05"],
@@ -420,7 +422,9 @@ module When
       ["[鳩山由紀夫]1.09.16",				"@A", "2009-09-16"],
       ["[菅直人]1.06.08",				"@A", "2010-06-08"],
       ["[野田佳彦]1.09.02",				"@A", "2011-09-02"],
-      ["[安倍晋三･再=ja:%%<安倍晋三>]1.12.26",		"@A", "2012-12-26"]
+      ["[安倍晋三･再=ja:%%<安倍晋三>]1.12.26",		"@A", "2012-12-26",
+        "name=[今上天皇=ja:%%<徳仁>,Emperor_Kinjō=en:Naruhito];2019-05-01", ""],
+      ["[菅義偉]1.09.16",				"@A", "2020-09-16"]
     ]]
   end
 end

data/lib/when_exe/region/japanese/location.rb

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 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::Coordinates
+
+  t1 = LocationTable[1]
+  t2 = LocationTable[2]
+  t3 = LocationTable[3]
+  t4 = LocationTable[4]
+  co = (0..2).to_a
+
+  # 位置参照情報ダウンロードサービス「全ての大字・町丁目レベル」( http://nlftp.mlit.go.jp/isj/ )を配置してください
+  geolocation_data = When::Parts::Resource.root_dir + '/data/geolocation/japanese/*.csv'
+
+  #
+  # はしご高など UTF-8 への変換に失敗するコードを含む地名は登録しない
+  #
+  # @private
+  def self.utf_gets(io)
+    error_occurred = false
+    line = nil
+    loop do
+      error = nil
+      begin
+        line = io.gets
+      rescue Encoding::UndefinedConversionError => error
+        error_occurred = true
+      end
+      unless error
+        return error_occurred ? utf_gets(io) : line
+      end
+    end
+  end
+
+  Dir.glob(geolocation_data).each do |path|
+    open(path,'r:SHIFT_JIS') do |io|
+      h = {}
+      lines = ''
+      while (line = utf_gets(io))
+        lines.concat(line)
+      end
+      CSV.parse(lines) do |r|
+        if h.empty?
+          h = Hash[*(0...r.size).to_a.map {|i| [r[i],i]}.flatten]
+        else
+          location    = [r[h['経度']].to_f, r[h['緯度']].to_f, 0]
+          wide_name   = r[h['都道府県名']]
+          middle_name = wide_name + r[h['市区町村名']]
+          fine_name   = r[h['大字町丁目名']]
+          full_name   = middle_name + fine_name
+          t1[full_name] = location
+          t2[middle_name][fine_name] = location
+          t3[wide_name][r[h['市区町村名']]][fine_name] = location
+          case r[h['市区町村名']]
+          when /\A((.+)市)(.+区)\z/
+            t1[$1 + $3 + fine_name] = location
+            t2[$1 + $3] [fine_name] = location
+            t3[$1] [$3] [fine_name] = location
+            t3[$2] [$3] [fine_name] = location
+          when /\A((.+)市)\z/
+            t4[$1] << middle_name
+            t4[$2] << middle_name
+            t4[$1 + fine_name] << full_name
+          when /\A.+郡(.+[町村])\z/
+            t4[wide_name + $1] << middle_name
+            t4[wide_name + $1 + fine_name] << full_name
+          end
+        end
+      end
+    end
+  end
+
+  t3.keys.each do |p|
+    t3[p].keys.each do |c|
+      locations = t3[p][c].values.transpose
+      t3[p][c][:SWB] = t2[p+c][:SWB] = co.map {|i| locations[i].min}
+      t3[p][c][:NET] = t2[p+c][:NET] = co.map {|i| locations[i].max}
+    end
+    swb = t3[p].keys.map {|c| t3[p][c][:SWB]}.transpose
+    net = t3[p].keys.map {|c| t3[p][c][:NET]}.transpose
+    t3[p][:SWB] = co.map {|i| swb[i].min}
+    t3[p][:NET] = co.map {|i| net[i].max}
+  end
+
+  t4.each_pair do |key, value|
+    value.uniq!
+  end
+end

data/lib/when_exe/region/japanese/nihon_shoki.rb

@@ -1,70 +1,70 @@
-# -*- coding: utf-8 -*-
-=begin
-  Copyright (C) 2011-2014 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
-
-class When::TM::CalendarEra
-
-  #
-  # 皇紀
-  #
-  NihonKoki = [self, [
-    "locale:[=ja:, en=en:, alias]",
-    "area:[日本]",
-    ["[皇紀=ja:%%<神武天皇即位紀元>]1",		"@A",	"-659-01-01^JapaneseTwin::平朔儀鳳暦"],
-    ["[皇紀=ja:%%<神武天皇即位紀元>]1114",	"@CR",	"0454-01-01^Japanese"],
-    ["[皇紀=ja:%%<神武天皇即位紀元>]2533",	"@CR",	"1873-01-01^Gregorian"]
-  ]]
-
-  #
-  # 日本書紀暦日
-  #
-  NihonShoki = [self, [
-    "locale:[=ja:, en=en:, alias]",
-    "period:[日本(日本書紀)=ja:%%<日本書紀>, (Nihon_Shoki)=en:Nihon_Shoki]",
-    ["[<神武>=ja:%%<神武天皇>]1",	"@A",	"name=[神武=ja:%%<神武天皇>];-659-01-01^JapaneseTwin::平朔儀鳳暦"],
-    ["[<綏靖>=ja:%%<綏靖天皇>]1",	"@A",	"name=[綏靖=ja:%%<綏靖天皇>];-580-01-08"],
-    ["[<安寧>=ja:%%<安寧天皇>]0",	"@A",	"name=[安寧=ja:%%<安寧天皇>];-548-07-03"],
-    ["[<懿徳>=ja:%%<懿徳天皇>]1",	"@A",	"name=[懿徳=ja:%%<懿徳天皇>];-509-02-04"],
-    ["[<孝昭>=ja:%%<孝昭天皇>]1",	"@A",	"name=[孝昭=ja:%%<孝昭天皇>];-474-01-09"],
-    ["[<孝安>=ja:%%<孝安天皇>]1",	"@A",	"name=[孝安=ja:%%<孝安天皇>];-391-01-07"],
-    ["[<孝霊>=ja:%%<孝霊天皇>]1",	"@A",	"name=[孝霊=ja:%%<孝霊天皇>];-289-01-12"],
-    ["[<孝元>=ja:%%<孝元天皇>]1",	"@A",	"name=[孝元=ja:%%<孝元天皇>];-213-01-14"],
-    ["[<開化>=ja:%%<開化天皇>]0",	"@A",	"name=[開化=ja:%%<開化天皇>];-157-11-12"],
-    ["[<崇神>=ja:%%<崇神天皇>]1",	"@A",	"name=[崇神=ja:%%<崇神天皇>];-096-01-13"],
-    ["[<垂仁>=ja:%%<垂仁天皇>]1",	"@A",	"name=[垂仁=ja:%%<垂仁天皇>];-028-01-02"],
-    ["[<景行>=ja:%%<景行天皇>]1",	"@A",	"name=[景行=ja:%%<景行天皇>];0071-07-11"],
-    ["[<成務>=ja:%%<成務天皇>]1",	"@A",	"name=[成務=ja:%%<成務天皇>];0131-01-05"],
-    ["[<仲哀>=ja:%%<仲哀天皇>]1",	"@A",	"name=[仲哀=ja:%%<仲哀天皇>];0192-01-11"],
-    ["[<神功皇后>=ja:%%<神功皇后>]0",  "@A","name=[神功皇后=ja:%%<神功皇后>];0200-02-07"],
-    ["[<応神>=ja:%%<応神天皇>]1",	"@A",	"name=[応神=ja:%%<応神天皇>];0270-01-01"],
-    ["[<仁徳>=ja:%%<仁徳天皇>]1",	"@A",	"name=[仁徳=ja:%%<仁徳天皇>];0313-01-03"],
-    ["[<履中>=ja:%%<履中天皇>]1",	"@A",	"name=[履中=ja:%%<履中天皇>];0400-02-01"],
-    ["[<反正>=ja:%%<反正天皇>]1",	"@A",	"name=[反正=ja:%%<反正天皇>];0406-01-02"],
-    ["[<允恭>=ja:%%<允恭天皇>]1",	"@A",	"name=[允恭=ja:%%<允恭天皇>];0412-12"],
-    ["[<安康>=ja:%%<安康天皇>]0",	"@A",	"name=[安康=ja:%%<安康天皇>];0453-12-14^ChineseTwin::元嘉暦"],
-    ["[<雄略>=ja:%%<雄略天皇>]0",	"@A",	"name=[雄略=ja:%%<雄略天皇>];0456-11-13"],
-    ["[<清寧>=ja:%%<清寧天皇>]1",	"@A",	"name=[清寧=ja:%%<清寧天皇>];0480-01-15"],
-    ["[<顕宗>=ja:%%<顕宗天皇>]1",	"@A",	"name=[顕宗=ja:%%<顕宗天皇>];0485-01-01"],
-    ["[<仁賢>=ja:%%<仁賢天皇>]1",	"@A",	"name=[仁賢=ja:%%<仁賢天皇>];0488-01-05"],
-    ["[<武烈>=ja:%%<武烈天皇>]0",	"@A",	"name=[武烈=ja:%%<武烈天皇>];0498-12"],
-    ["[<継体>=ja:%%<継体天皇>]1",	"@A",	"name=[継体=ja:%%<継体天皇>];0507-02-04"],
-    ["[<安閑>=ja:%%<安閑天皇>]1",	"@A",	"name=[安閑=ja:%%<安閑天皇>];0534"],
-    ["[<宣化>=ja:%%<宣化天皇>]0",	"@A",	"name=[宣化=ja:%%<宣化天皇>];0535-12"],
-    ["[<欽明>=ja:%%<欽明天皇>]0",	"@A",	"name=[欽明=ja:%%<欽明天皇>];0539-12-05"],
-    ["[<敏達>=ja:%%<敏達天皇>]1",	"@A",	"name=[敏達=ja:%%<敏達天皇>];0572-04-03"],
-    ["[<用明>=ja:%%<用明天皇>]0",	"@A",	"name=[用明=ja:%%<用明天皇>];0585-09-05"],
-    ["[<崇峻>=ja:%%<崇峻天皇>]0",	"@A",	"name=[崇峻=ja:%%<崇峻天皇>];0587-08-02"],
-    ["[<推古>=ja:%%<推古天皇>]0",	"@A",	"name=[推古=ja:%%<推古天皇>];0592-12-08"],
-    ["[<舒明>=ja:%%<舒明天皇>]1",	"@A",	"name=[舒明=ja:%%<舒明天皇>];0629-01-04"],
-    ["[<皇極>=ja:%%<皇極天皇>]1",	"@A",	"name=[皇極=ja:%%<皇極天皇>];0642-01-15"],
-    ["[大化]1",				"@A",	"name=[孝徳=ja:%%<孝徳天皇>];0645-06-19"],
-    ["[白雉]1",				"@FE",			"	     0650-02-15"],
-    ["[<斉明>=ja:%%<皇極天皇>]1",	"@A",	"name=[斉明=ja:%%<皇極天皇>];0655-01-03"],
-    ["[<天智>=ja:%%<天智天皇>]1",	"@A",	"name=[天智=ja:%%<天智天皇>];0662-01-01"],
-    ["[<天武>=ja:%%<天武天皇>]1",	"@A",	"name=[天武=ja:%%<天武天皇>];0672-01-01"],
-    ["[朱鳥]1",			"",					    "0686-07-20", "0687-01-01"]
-  ]]
-end
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2011-2014 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
+
+class When::TM::CalendarEra
+
+  #
+  # 皇紀
+  #
+  NihonKoki = [self, [
+    "locale:[=ja:, en=en:, alias]",
+    "area:[日本]",
+    ["[皇紀=ja:%%<神武天皇即位紀元>]1",		"@A",	"-659-01-01^JapaneseTwin::平朔儀鳳暦"],
+    ["[皇紀=ja:%%<神武天皇即位紀元>]1114",	"@CR",	"0454-01-01^Japanese"],
+    ["[皇紀=ja:%%<神武天皇即位紀元>]2533",	"@CR",	"1873-01-01^Gregorian"]
+  ]]
+
+  #
+  # 日本書紀暦日
+  #
+  NihonShoki = [self, [
+    "locale:[=ja:, en=en:, alias]",
+    "period:[日本(日本書紀)=ja:%%<日本書紀>, (Nihon_Shoki)=en:Nihon_Shoki]",
+    ["[<神武>=ja:%%<神武天皇>]1",	"@A",	"name=[神武=ja:%%<神武天皇>];-659-01-01^JapaneseTwin::平朔儀鳳暦"],
+    ["[<綏靖>=ja:%%<綏靖天皇>]1",	"@A",	"name=[綏靖=ja:%%<綏靖天皇>];-580-01-08"],
+    ["[<安寧>=ja:%%<安寧天皇>]0",	"@A",	"name=[安寧=ja:%%<安寧天皇>];-548-07-03"],
+    ["[<懿徳>=ja:%%<懿徳天皇>]1",	"@A",	"name=[懿徳=ja:%%<懿徳天皇>];-509-02-04"],
+    ["[<孝昭>=ja:%%<孝昭天皇>]1",	"@A",	"name=[孝昭=ja:%%<孝昭天皇>];-474-01-09"],
+    ["[<孝安>=ja:%%<孝安天皇>]1",	"@A",	"name=[孝安=ja:%%<孝安天皇>];-391-01-07"],
+    ["[<孝霊>=ja:%%<孝霊天皇>]1",	"@A",	"name=[孝霊=ja:%%<孝霊天皇>];-289-01-12"],
+    ["[<孝元>=ja:%%<孝元天皇>]1",	"@A",	"name=[孝元=ja:%%<孝元天皇>];-213-01-14"],
+    ["[<開化>=ja:%%<開化天皇>]0",	"@A",	"name=[開化=ja:%%<開化天皇>];-157-11-12"],
+    ["[<崇神>=ja:%%<崇神天皇>]1",	"@A",	"name=[崇神=ja:%%<崇神天皇>];-096-01-13"],
+    ["[<垂仁>=ja:%%<垂仁天皇>]1",	"@A",	"name=[垂仁=ja:%%<垂仁天皇>];-028-01-02"],
+    ["[<景行>=ja:%%<景行天皇>]1",	"@A",	"name=[景行=ja:%%<景行天皇>];0071-07-11"],
+    ["[<成務>=ja:%%<成務天皇>]1",	"@A",	"name=[成務=ja:%%<成務天皇>];0131-01-05"],
+    ["[<仲哀>=ja:%%<仲哀天皇>]1",	"@A",	"name=[仲哀=ja:%%<仲哀天皇>];0192-01-11"],
+    ["[<神功皇后>=ja:%%<神功皇后>]0",  "@A","name=[神功皇后=ja:%%<神功皇后>];0200-02-07"],
+    ["[<応神>=ja:%%<応神天皇>]1",	"@A",	"name=[応神=ja:%%<応神天皇>];0270-01-01"],
+    ["[<仁徳>=ja:%%<仁徳天皇>]1",	"@A",	"name=[仁徳=ja:%%<仁徳天皇>];0313-01-03"],
+    ["[<履中>=ja:%%<履中天皇>]1",	"@A",	"name=[履中=ja:%%<履中天皇>];0400-02-01"],
+    ["[<反正>=ja:%%<反正天皇>]1",	"@A",	"name=[反正=ja:%%<反正天皇>];0406-01-02"],
+    ["[<允恭>=ja:%%<允恭天皇>]1",	"@A",	"name=[允恭=ja:%%<允恭天皇>];0412-12"],
+    ["[<安康>=ja:%%<安康天皇>]0",	"@A",	"name=[安康=ja:%%<安康天皇>];0453-12-14^ChineseTwin::元嘉暦"],
+    ["[<雄略>=ja:%%<雄略天皇>]0",	"@A",	"name=[雄略=ja:%%<雄略天皇>];0456-11-13"],
+    ["[<清寧>=ja:%%<清寧天皇>]1",	"@A",	"name=[清寧=ja:%%<清寧天皇>];0480-01-15"],
+    ["[<顕宗>=ja:%%<顕宗天皇>]1",	"@A",	"name=[顕宗=ja:%%<顕宗天皇>];0485-01-01"],
+    ["[<仁賢>=ja:%%<仁賢天皇>]1",	"@A",	"name=[仁賢=ja:%%<仁賢天皇>];0488-01-05"],
+    ["[<武烈>=ja:%%<武烈天皇>]0",	"@A",	"name=[武烈=ja:%%<武烈天皇>];0498-12"],
+    ["[<継体>=ja:%%<継体天皇>]1",	"@A",	"name=[継体=ja:%%<継体天皇>];0507-02-04"],
+    ["[<安閑>=ja:%%<安閑天皇>]1",	"@A",	"name=[安閑=ja:%%<安閑天皇>];0534"],
+    ["[<宣化>=ja:%%<宣化天皇>]0",	"@A",	"name=[宣化=ja:%%<宣化天皇>];0535-12"],
+    ["[<欽明>=ja:%%<欽明天皇>]0",	"@A",	"name=[欽明=ja:%%<欽明天皇>];0539-12-05"],
+    ["[<敏達>=ja:%%<敏達天皇>]1",	"@A",	"name=[敏達=ja:%%<敏達天皇>];0572-04-03"],
+    ["[<用明>=ja:%%<用明天皇>]0",	"@A",	"name=[用明=ja:%%<用明天皇>];0585-09-05"],
+    ["[<崇峻>=ja:%%<崇峻天皇>]0",	"@A",	"name=[崇峻=ja:%%<崇峻天皇>];0587-08-02"],
+    ["[<推古>=ja:%%<推古天皇>]0",	"@A",	"name=[推古=ja:%%<推古天皇>];0592-12-08"],
+    ["[<舒明>=ja:%%<舒明天皇>]1",	"@A",	"name=[舒明=ja:%%<舒明天皇>];0629-01-04"],
+    ["[<皇極>=ja:%%<皇極天皇>]1",	"@A",	"name=[皇極=ja:%%<皇極天皇>];0642-01-15"],
+    ["[大化]1",				"@A",	"name=[孝徳=ja:%%<孝徳天皇>];0645-06-19"],
+    ["[白雉]1",				"@FE",			"	     0650-02-15"],
+    ["[<斉明>=ja:%%<皇極天皇>]1",	"@A",	"name=[斉明=ja:%%<皇極天皇>];0655-01-03"],
+    ["[<天智>=ja:%%<天智天皇>]1",	"@A",	"name=[天智=ja:%%<天智天皇>];0662-01-01"],
+    ["[<天武>=ja:%%<天武天皇>]1",	"@A",	"name=[天武=ja:%%<天武天皇>];0672-01-01"],
+    ["[朱鳥]1",			"",					    "0686-07-20", "0687-01-01"]
+  ]]
+end

data/lib/when_exe/region/japanese/notes.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2012-2015 Takashi SUGA
+  Copyright (C) 2012-2021 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
@@ -32,7 +32,19 @@ class When::CalendarNote
     # 日本暦注の要素
     #
     # @private
-    class Note < When::CalendarNote::NoteElement
+    class Note < When::BasicTypes::Object
+
+      include When::CalendarNote::NoteElement
+
+      #
+      # _m17n_form のための要素生成
+      #
+      # @param [Hash] options 下記のとおり
+      # @option options [Symbol] :method :to_m17n なら label を返す、その他は When::Parts::Resource#to_h 参照
+      #
+      def _to_hash_value(options={})
+        options[:method] == :to_m17n ? label : super
+      end
     end
 
     #
@@ -76,7 +88,7 @@ class When::CalendarNote
         [Note, 0x0003, "label:[天道=]",      'position:暦序',   'suffix:-'],                 # 14: 支
         [Note, 0x0003, "label:[人道=]",      'position:暦序',   'suffix:-'],                 # 15: 支
         [Note, 0x3FFC, "label:[歳次=]",      'position:暦序',   'suffix:-'],                 # 16: 支
-        [Note, 0xF800, "label:[金神]",       'position:仮名暦', 'suffix:在'],                # 17: 干
+        [Note, 0xFC00, "label:[金神]",       'position:仮名暦', 'suffix:在'],                # 17: 干
         [Note, 0xFFFF, "label:[大小]",       'position:暦序']                                # 18: 朔閏表
       ],
 
@@ -136,10 +148,10 @@ class When::CalendarNote
         [Note, 0x3FFC, "label:[六十卦=]",    'position:時候'],                               # 12: 太陽黄経
         [Note, 0xF800, "label:[節分]",       'position:雑節'],                               # 13: 立春からの日数
         [Note, 0xF800, "label:[初午]",       'position:雑節'],                               # 14: 支 節月 or 暦月
-        [Note, 0xF800, "label:[八十八夜]",   'position:雑節'],                               # 15: 立春からの日数
+        [Note, 0xFC00, "label:[八十八夜]",   'position:雑節'],                               # 15: 立春からの日数
         [Note, 0xF800, "label:[入梅]",       'position:雑節'],                               # 16: 干 太陽黄経
         [Note, 0xF800, "label:[半夏生]",     'position:雑節'],                               # 17: 干 太陽黄経
-        [Note, 0xF800, "label:[二百十日]",   'position:雑節'],                               # 18: 立春からの日数
+        [Note, 0xFC00, "label:[二百十日]",   'position:雑節'],                               # 18: 立春からの日数
         [Note, 0xF800, "label:[二百廿日=ja:%%<二百二十日>]", 'position:雑節'],               # 19: 立春からの日数
 
         [Note, 0x3FFC, "label:[大禍=ja:%%<暦注下段>#%.<大禍日>]",
@@ -256,7 +268,7 @@ class When::CalendarNote
         [Note, 0xC000, "label:[己巳]",       'position:仮名暦'],                             # 90: 干支
         [Note, 0xF800, "label:[庚申待]",     'position:仮名暦'],                             # 91: 干支
         [Note, 0xF800, "label:[犯土]",       'position:仮名暦'],                             # 92: 干支
-        [Note, 0xF800, "label:[十方暮]",     'position:仮名暦'],                             # 93: 干支
+        [Note, 0xFC00, "label:[十方暮]",     'position:仮名暦'],                             # 93: 干支
         [Note, 0xF800, "label:[一粒万倍=ja:%%<一粒万倍日>]",
                                              'position:仮名暦', 'suffix:日'],                # 94: 支 節月
         [Note, 0x3800, "label:[天福=]",      'position:仮名暦'],                             # 95: 支 節月
@@ -265,7 +277,7 @@ class When::CalendarNote
         [Note, 0xB800, "label:[三隣亡]",     'position:仮名暦'],                             # 98: 支 節月
         [Note, 0xF800, "label:[不成就=ja:%%<不成就日>]",
                                              'position:仮名暦', 'suffix:日'],                # 99: 暦月 暦日/晦日
-        [Note, 0x3800, "label:[鬼宿]",       'position:仮名暦'],                             #100: 廿八宿
+        [Note, 0x3C00, "label:[鬼宿]",       'position:仮名暦'],                             #100: 廿八宿
         [Note, 0x3800, "label:[金性=]",      'position:仮名暦'],                             #101: 支 節月 支 節年
         [Note, 0x3FFF, "label:[三寶吉=http://kotobank.jp/word/%%<三宝吉日>]",
                                              'position:上段 上段 上段 上段'],                #102: 干支 節月
@@ -274,7 +286,7 @@ class When::CalendarNote
         [Note, 0x3FFF, "label:[雑事吉=]",    'position:雑事吉'],                             #104: 干支 節月
         [Note, 0x3FFF, "label:[小字注=]",    'position:下段小字 下段小字 下段小字 下段小字'],#105: 干支 節月
         [Note, 0xC000, "label:[土用の丑]",   'position:雑節'],                               #106: 土用の丑
-        [Note, 0xC000, "label:[陰陽遁始]",   'position:民間'],                               #107: 九星の陰遁・陽遁の折り返し日
+        [Note, 0xC000, "label:[陰陽遁始=]",  'position:民間'],                               #107: 九星の陰遁・陽遁の折り返し日
       ]
     ]]
 
@@ -526,8 +538,8 @@ class When::CalendarNote
       patch  = SolarTerms::Patch[result.to_i]
       return result unless patch
       num, den  = parameter.kind_of?(String) ? parameter.split('/', 2) : parameter
-      num  = (num ||   0).to_f
-      den  = (den || 360).to_f
+      num  = (num || @num ||   0).to_f
+      den  = (den || @den || 360).to_f
       diff = (num - patch[0] + 1) % den - 1
       return result if diff == 0
       patched = result + When::P1D * diff
@@ -536,6 +548,9 @@ class When::CalendarNote
       result
     end
 
+    # 二十四節気のための event_delta の別名
+    alias :term_delta :event_delta
+
     # 月の位相 => 日時
     #
     # @param [When::TM::TemporalPosition] date 探す基準とする日時
@@ -576,6 +591,9 @@ class When::CalendarNote
       result
     end
 
+    # 月の位相のための event_delta の別名
+    alias :phase_delta :event_delta
+
     private
 
     # オブジェクトの正規化
@@ -722,7 +740,7 @@ class When::CalendarNote
     #
     # 任意の暦を日本年号付暦日に変換
     #
-    # @param When::TM::CalDate] date 変換元日付
+    # @param [When::TM::CalDate] date 変換元日付
     #
     # @return [When::TM::CalDate] 変換結果
     #
@@ -737,7 +755,7 @@ class When::CalendarNote
     #
     # 日本年号付暦日か?
     #
-    # @param When::TM::CalDate] date 確認する日付
+    # @param [When::TM::CalDate] date 確認する日付
     #
     # @return [Boolean] true YES / false NO
     #
@@ -780,6 +798,7 @@ class When::CalendarNote
       [ 1,29] => [[1873..1873, When.M17n('JapaneseHoliday::神武天皇即位日')]],
       [ 1,30] => [[1874..1912, When.M17n('JapaneseHoliday::孝明天皇祭')]],
       [ 2,11] => [[1874..1948, When.M17n('JapaneseHoliday::紀元節')], [1967..2100, When.M17n('JapaneseHoliday::建国記念の日')]],
+      [ 2,23] => [[2020..2100, When.M17n('JapaneseHoliday::天皇誕生日')]],
       [ 2,24] => [[1989..1989, When.M17n('JapaneseHoliday::昭和天皇の大喪の礼')]],
       [ 3, 3] => [[1868..1872, When.M17n('JapaneseHoliday::弥生節句')]],
       [ 3, 0] => [[1879..1948, When.M17n('JapaneseHoliday::春季皇霊祭')], [1949..2100, When.M17n('JapaneseHoliday::春分の日')]],
@@ -787,6 +806,7 @@ class When::CalendarNote
       [ 4,10] => [[1959..1959, When.M17n('JapaneseHoliday::皇太子明仁親王の結婚の儀')]],
       [ 4,29] => [[1927..1948, When.M17n('JapaneseHoliday::天長節')], [1949..1988, When.M17n('JapaneseHoliday::天皇誕生日')],
                   [1989..2006, When.M17n('JapaneseHoliday::みどりの日')], [2007..2100, When.M17n('JapaneseHoliday::昭和の日')]],
+      [ 5, 1] => [[2019..2019, When.M17n('JapaneseHoliday::即位の日')]],
       [ 5, 3] => [[1949..2100, When.M17n('JapaneseHoliday::憲法記念日')]],
       [ 5, 4] => [[2007..2100, When.M17n('JapaneseHoliday::みどりの日')]],
       [ 5, 5] => [[1868..1872, When.M17n('JapaneseHoliday::端午節句')], [1949..2100, When.M17n('JapaneseHoliday::こどもの日')]],
@@ -794,28 +814,35 @@ class When::CalendarNote
       [ 7, 7] => [[1868..1872, When.M17n('JapaneseHoliday::七夕節句')]],
       [ 7,15] => [[1868..1872, When.M17n('JapaneseHoliday::お盆')]],
       [ 7,20] => [[1996..2002, When.M17n('JapaneseHoliday::海の日')]],
-      [ 7,-3] => [[2003..2100, When.M17n('JapaneseHoliday::海の日')]],
+      [ 7,22] => [[2021..2021, When.M17n('JapaneseHoliday::海の日')]],
+      [ 7,23] => [[2020..2020, When.M17n('JapaneseHoliday::海の日')],[2021..2021, When.M17n('JapaneseHoliday::スポーツの日')]],
+      [ 7,-3] => [[2003..2019, When.M17n('JapaneseHoliday::海の日')],[2022..2100, When.M17n('JapaneseHoliday::海の日')]],
+      [ 7,24] => [[2020..2020, When.M17n('JapaneseHoliday::スポーツの日')]],
       [ 7,30] => [[1913..1926, When.M17n('JapaneseHoliday::明治天皇祭')]],
       [ 8, 1] => [[1868..1872, When.M17n('JapaneseHoliday::田実節句')]],
-      [ 8,11] => [[2016..2100, When.M17n('JapaneseHoliday::山の日')]],
+      [ 8, 8] => [[2021..2021, When.M17n('JapaneseHoliday::山の日')]],
+      [ 8,10] => [[2020..2020, When.M17n('JapaneseHoliday::山の日')]],
+      [ 8,11] => [[2016..2019, When.M17n('JapaneseHoliday::山の日')],[2022..2100, When.M17n('JapaneseHoliday::山の日')]],
       [ 8,31] => [[1913..1926, When.M17n('JapaneseHoliday::天長節')]],
       [ 9, 9] => [[1868..1872, When.M17n('JapaneseHoliday::重陽節句')]],
       [ 9,15] => [[1966..2002, When.M17n('JapaneseHoliday::敬老の日')]],
       [ 9,-3] => [[2003..2100, When.M17n('JapaneseHoliday::敬老の日')]],
       [ 9,17] => [[1874..1878, When.M17n('JapaneseHoliday::神嘗祭')]],
       [ 9, 0] => [[1878..1947, When.M17n('JapaneseHoliday::秋季皇霊祭')], [1948..2100, When.M17n('JapaneseHoliday::秋分の日')]],
+      [10, 2] => [[1929..1929, When.M17n('JapaneseHoliday::皇大神宮遷御当日')]],
       [10,10] => [[1966..1999, When.M17n('JapaneseHoliday::体育の日')]],
-      [10,-2] => [[2000..2100, When.M17n('JapaneseHoliday::体育の日')]],
+      [10,-2] => [[2000..2019, When.M17n('JapaneseHoliday::体育の日')],[2022..2100, When.M17n('JapaneseHoliday::スポーツの日')]],
       [10,17] => [[1879..1947, When.M17n('JapaneseHoliday::神嘗祭')]],
+      [10,22] => [[2019..2019, When.M17n('JapaneseHoliday::即位礼正殿の儀')]],
       [10,31] => [[1913..1926, When.M17n('JapaneseHoliday::天長節祝日')]],
       [11, 3] => [[1873..1911, When.M17n('JapaneseHoliday::天長節')], [1927..1947, When.M17n('JapaneseHoliday::明治節')],
                   [1948..2100, When.M17n('JapaneseHoliday::文化の日')]],
       [11,10] => [[1915..1915, When.M17n('JapaneseHoliday::即位の礼')], [1928..1928, When.M17n('JapaneseHoliday::即位の礼')]],
-      [11,12] => [[1990..1990, When.M17n('JapaneseHoliday::即位の礼正殿の儀')]],
+      [11,12] => [[1990..1990, When.M17n('JapaneseHoliday::即位礼正殿の儀')]],
       [11,14] => [[1915..1915, When.M17n('JapaneseHoliday::大嘗祭')], [1928..1928, When.M17n('JapaneseHoliday::大嘗祭')]],
       [11,16] => [[1915..1915, When.M17n('JapaneseHoliday::大饗第1日')], [1928..1928, When.M17n('JapaneseHoliday::大饗第1日')]],
       [11,23] => [[1873..1947, When.M17n('JapaneseHoliday::新嘗祭')], [1948..2100, When.M17n('JapaneseHoliday::勤労感謝の日')]],
-      [12,23] => [[1989..2100, When.M17n('JapaneseHoliday::天皇誕生日')]],
+      [12,23] => [[1989..2018, When.M17n('JapaneseHoliday::天皇誕生日')]],
       [12,25] => [[1927..1947, When.M17n('JapaneseHoliday::大正天皇祭')]]
     }
 
@@ -1253,7 +1280,19 @@ class When::CalendarNote
       2396063 => [315.0, 1], # 弘化05(1848).01.01 [315.0, 0] 没
 
       2397583 => [ 15.0, 1], # 嘉永05(1852).02=15 [ 14.0, 0] 没
-      2397584 => [ 16.0, 0]  # 嘉永05(1852).02=16 [ 15.0, 1] 清明 (計算誤差の補正)
+      2397584 => [ 16.0, 0], # 嘉永05(1852).02=16 [ 15.0, 1] 清明 (計算誤差の補正)
+
+      2451110 => [210.0, 1], # 平成10(1998).10.23 [209.0, 0] 没
+      2451111 => [211.0, 0], # 平成10(1998).10.24 [210.0, 1] 霜降 (計算誤差の補正)
+
+      2459950 => [284.0, 0], # 令和05(2023).01.05 [285.0, 1] 小寒 (計算誤差の補正)
+      2459951 => [285.0, 1], # 令和05(2023).01.06 [285.0, 0] 没
+
+      2460651 => [254.0, 0], # 令和06(2024).12.06 [255.0, 1] 大雪 (計算誤差の補正)
+      2460652 => [255.0, 1], # 令和06(2024).12.07 [255.0, 0] 没
+
+      2461031 => [269.0, 0], # 令和07(2025).12.21 [270.0, 1] 冬至 (計算誤差の補正)
+      2461032 => [270.0, 1]  # 令和07(2025).12.22 [270.0, 0] 没
     }
 
     class << self