when_exe 0.4.6 → 0.5.0

data/lib/when_exe/region/saudi_arabian.rb

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2017 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
+  class BasicTypes::M17n
+
+    SaudiArabia = [self, [
+      "locale:[=en:, ja=ja:, zh=zh:, alias]",
+      "names:[SaudiArabia=en:Saudi_Arabia, サウジアラビア, 沙特阿拉伯]",
+      "[UmmalquraSolar=http://www.staff.science.uu.nl/~gent0113/islam/ummalqura_solar.htm, サウジアラビア太陽暦=, 沙特阿拉伯太陽曆, era:AH=]",
+
+      [self,
+        "locale:[=en:, ja=ja:, alias=en:]",
+        "names:[month name named after the zodiac=, 黄道十二宮にちなむ月名=, zh:對應於黃道十二宮月份名稱=, *alias:SolarMonth=]",
+        "[al-Mīzān=,     天秤宮,     Libra      ]",
+        "[al-ʿAqrab=,    天蝎宮,     Scorpio    ]",
+        "[al-Qaws=,      人馬宮,     Sagittarius]",
+        "[al-Jady=,      磨羯宮,     Capricorn  ]",
+        "[al-Dalw=,      宝瓶宮,     Aquarius   ]",
+        "[al-Ḥūt=,       双魚宮,     Pisces     ]",
+        "[al-Ḥamal=,     白羊宮,     Aries      ]",
+        "[al-Thawr=,     金牛宮,     Taurus     ]",
+        "[al-Jawzāʾ=,    双児宮,     Gemini     ]",
+        "[al-Saraṭān=,   巨蟹宮,     Cancer     ]",
+        "[al-Asad=,      獅子宮,     Leo        ]",
+        "[al-Sunbula=,   処女宮,     Virgo      ]"
+      ],
+
+    ]]
+  end
+
+  module CalendarTypes
+
+    #
+    # Ummalqura Solar Calendar
+    #
+    UmmalquraSolar = [SolarYearTableBased, {
+      'label'   =>  'SaudiArabia::UmmalquraSolar',
+      'origin_of_MSC' => -621,
+      'diff_to_CE'    =>    0,
+      'engine_month'  =>    9,
+      'engine_day'    =>   23,
+      'indices' => [
+        When.Index('SaudiArabia::SolarMonth', {:unit=>12}),
+        When::Coordinates::DefaultDayIndex
+      ],
+      'rule_table'    => {
+        365 => {'Length'=> [30]*5 + [29] + [31]*6},
+        366 => {'Length'=> [30]*6        + [31]*6}
+      }
+    }]
+  end
+end

data/lib/when_exe/region/world.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
@@ -161,8 +161,8 @@ module When
     World =  [SolarYearTableBased, {
       'label'   => 'World',
       'rule_table'       => {
-        365  => {'Length'=>[31,30,30]*3 + [31,30,31]},
-        366  => {'Length'=>[31,30,30,31,30,31] *2}
+        365  => {'Length'=>[31,30,30] * 3 + [31,30,31]},
+        366  => {'Length'=>[31,30,30,31,30,31] * 2}
       },
       'note'   => 'WorldWeek'
     }]

data/lib/when_exe/timestandard.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2016 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
@@ -53,11 +53,13 @@ module When::TimeStandard
      [2453736.5, 33.0],
      [2454832.5, 34.0],
      [2456109.5, 35.0],
-     [2457204.5, 36.0]]
+     [2457204.5, 36.0],
+     [2457754.5, 37.0]]
 
   DeltaT  = [                                                                63.467, # 1999
      63.827, 64.092, 64.300, 64.473, 64.573, 64.689, 64.846, 65.145, 65.456, 65.779, # 2000-
-     66.070, 66.324, 66.603, 66.909, 67.282, 67.642                                  # 2010-
+     66.070, 66.324, 66.603, 66.909, 67.282, 67.642, 68.102, 68.594, 68.968, 69.219, # 2010-
+     69.362                                                                          # 2020-
   ]
 
   class << self
@@ -82,7 +84,7 @@ module When::TimeStandard
       @leap_seconds  =
         if leap_seconds.kind_of?(String)
           OpenURI
-          open(leap_seconds) do |file|
+          URI.send(:open, leap_seconds) do |file|
             file.read.split(/[\n\r]+/).map { |line|
               line.split(/[^\d.]+/)[3..6].map {|d| d.to_f}
             }.reverse
@@ -109,7 +111,7 @@ module When::TimeStandard
     # 処理系が閏秒を無視しているか否か
     # @private
     def _is_systemtime_universal?
-      @is_systemtime_universal = ((Time.utc(1976).to_i - Time.utc(1975).to_i) % 86400 == 0) if @is_systemtime_universal == nil
+      @is_systemtime_universal = ((Time.utc(1976).to_i - Time.utc(1975).to_i) % 86400 == 0) if @is_systemtime_universal.nil?
       @is_systemtime_universal
     end
 

data/lib/when_exe/tmobjects.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
@@ -1285,7 +1285,7 @@ module When::TM
     #   @param [Range] range 生成する桁の範囲
     #
     def initialize(*args)
-      @options = (args[-1].kind_of?(Hash)) ? (args.pop.reject {|key,value| value == nil}) : {}
+      @options = (args[-1].kind_of?(Hash)) ? (args.pop.reject {|key,value| value.nil?}) : {}
       if args[0].kind_of?(Numeric)
         _initialize_by_unit(*args)
       else

data/lib/when_exe/tmposition.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2016 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
@@ -395,11 +395,13 @@ module When::TM
           result = []
           seed   = base
           guard  = (base - When::V::Event.default_until)...(base + When::V::Event.default_until)
+          count = 0
           while result.length < repeat && seed >= guard.first && seed < guard.last
             applied = seed.apply_delayed_options(delayed_options)
             applied = When::Parts::GeometricComplex.new(applied, delayed_options[:duration]) if delayed_options[:duration]
             result << applied if applied
-            seed += duration
+            count += 1
+            seed = base + duration * count
           end
           result.reverse! if duration.sign < 0
           return result
@@ -552,7 +554,7 @@ module When::TM
         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.kind_of?(String) && z =~ /\A[A-Z]+\z/
 
         unless d
           # ClockTime
@@ -958,7 +960,7 @@ module When::TM
     #
     def <=>(other)
       other = other.first if other.kind_of?(Range)
-      return universal_time <=> other if other.kind_of?(Numeric)
+      return universal_time <=> other unless other.respond_to?(:indeterminated_position)
 
       [self.indeterminated_position, other.indeterminated_position].each do |position|
         prec = SYSTEM if [TimeValue::Min, TimeValue::Max].include?(position)

data/lib/when_exe/tmreference.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2016 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
@@ -178,7 +178,7 @@ module When::TM
     # @return [When::TM::JulianDate]
     #
     def date_trans(cal_date, time=nil, options={})
-      time = cal_date.clk_time if ((time == nil) && cal_date.kind_of?(DateAndTime))
+      time = cal_date.clk_time if (time.nil? && cal_date.kind_of?(DateAndTime))
       frac = (time) ? time.universal_time : 0.0
       jdn  = to_julian_date(cal_date.cal_date)
       return JulianDate.universal_time((jdn - JulianDate::JD19700101) * Duration::DAY + frac, options)
@@ -1556,7 +1556,7 @@ module When::TM
         end
         @reference_date = epoch.frame.jul_trans(When.when?(jdn), {:frame=>epoch.frame})
         j_date = @reference_date.cal_date
-      elsif (@reference_date == nil)
+      elsif @reference_date.nil?
         @reference_date = epochs[0].dup
         j_date = @reference_date.cal_date
       end

data/lib/when_exe/version.rb

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2016 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
 
 module When
-  VERSION   = "0.4.6"
-  YEARS     = "(C) 2011-2016"
+  VERSION   = "0.5.0"
+  YEARS     = "(C) 2011-2021"
   AUTHOR    = "Takashi SUGA"
   COPYRIGHT = "#{YEARS} #{AUTHOR}"
 

data/test/events/example-datasets

@@ -3,5 +3,4 @@ GitHub:                               https://raw.githubusercontent.com/suchowan
 日本国首相一覧                        GitHub:primeminister-dataset.csv
 国会図書館暦画像                      GitHub:ndl_koyomi_index.csv
 日本の祝祭日                          GitHub:japanese-holiday-index.csv
-HOWMLが作成した森町のウィキ町史データ GitHub:mori_wikichoshi.csv
 中西版「歴史データベース」            history-dataset.csv

data/test/events/japanese-holiday.csv

@@ -13,6 +13,8 @@ R/1874-01-30...1913,孝明天皇祭,先帝祭,Emperor Kōmei's Death anniversary
 R/1874-02-11...1949,紀元節,紀元節,National Foundation Day,National Foundation Day
 R/1967-02-11...2100,建国記念の日,建国記念の日,National Foundation Day,National Foundation Day
 R/1973-02-{12&MO}...2100,振替休日,振替休日,Substitute holiday,Public holidays in Japan
+R/2020-02-23...2100,天皇誕生日,天皇誕生日,The Emperor's Birthday,Public holidays in Japan
+R/2020-02-{24&MO}...2100,振替休日,振替休日,Substitute holiday,Public holidays in Japan
 1989-02-24,昭和天皇の大喪の礼,大喪の礼,Emperor Shōwa's funeral ceremony,Public holidays in Japan
 R/1868-03-03...1873^^Japanese,弥生節句,上巳,Double Third Festival,Public holidays in Japan
 R/1879-03-1{SolarTerms#term0}T00+09:00...1949,春季皇霊祭,春季皇霊祭,Vernal Kōreisai,Kōreisai
@@ -25,6 +27,9 @@ R/1949-04-29...1989,天皇誕生日,天皇誕生日,The Emperor's Birthday,Publi
 R/1989-04-29...2007,みどりの日,みどりの日,Greenery Day,Greenery Day
 R/2007-04-29...2100,昭和の日,昭和の日,Shōwa Day,Shōwa Day
 R/1973-04-{30&MO}...2100,振替休日,振替休日,Substitute holiday,Public holidays in Japan
+2019-04-30,国民の休日,国民の休日,National Day Off,Public holidays in Japan
+2019-05-01,即位の日,即位の日,Coronation Day of the new Emperor,Coronation Day of the new Emperor
+2019-05-02,国民の休日,国民の休日,National Day Off,Public holidays in Japan
 R/1949-05-03...2100,憲法記念日,憲法記念日,Constitution Memorial Day,Constitution Memorial Day
 R/1973-05-{4&MO}...1988,振替休日,振替休日,Substitute holiday,Public holidays in Japan
 R/1988-05-04...2007,国民の休日,国民の休日,National Day Off,Public holidays in Japan
@@ -38,10 +43,19 @@ R/1868-07-07...1873^^Japanese,七夕節句,七夕,Qixi Festival,Qixi Festival
 R/1868-07-15...1873^^Japanese,お盆,お盆,Bon Festival,Bon Festival
 R/1996-07-20...2003,海の日,海の日,Marine Day,Marine Day
 R/1996-07-{21&MO}...2003,振替休日,振替休日,Substitute holiday,Public holidays in Japan
-R/2003-07-{3MO}...2100,海の日,海の日,Marine Day,Marine Day
+R/2003-07-{3MO}...2020,海の日,海の日,Marine Day,Marine Day
+R/2022-07-{3MO}...2100,海の日,海の日,Marine Day,Marine Day
+2021-07-22,海の日,海の日,Marine Day,Marine Day
+2020-07-23,海の日,海の日,Marine Day,Marine Day
+2021-07-23,スポーツの日,スポーツの日,National Sports Day,National Sports Day
+2020-07-24,スポーツの日,スポーツの日,National Sports Day,National Sports Day
 R/1913-07-30...1927,明治天皇祭,先帝祭,Emperor Meiji's Death anniversary,Public holidays in Japan
 R/1868-08-01...1873^^Japanese,田実節句,八朔,Hassaku,Public holidays in Japan
-R/2016-08-11...2100,山の日,山の日,Mountain Day,Public holidays in Japan
+2021-08-08,山の日,山の日,Mountain Day,Public holidays in Japan
+2021-08-09,振替休日,振替休日,Substitute holiday,Public holidays in Japan
+2020-08-10,山の日,山の日,Mountain Day,Public holidays in Japan
+R/2016-08-11...2020,山の日,山の日,Mountain Day,Public holidays in Japan
+R/2022-08-11...2100,山の日,山の日,Mountain Day,Public holidays in Japan
 R/2016-08-{12&MO}...2100,振替休日,振替休日,Substitute holiday,Public holidays in Japan
 R/1913-08-31...1927,天長節,天長節,The Emperor's Birthday,Public holidays in Japan
 R/1868-09-09...1873^^Japanese,重陽節句,重陽節句,Double Ninth Festival,Double Ninth Festival
@@ -53,10 +67,13 @@ R/2003-09-1{SolarTerms#term180-1&TU}T00+09:00...2100,国民の休日,国民の
 R/1878-09-1{SolarTerms#term180}T00+09:00...1948,秋季皇霊祭,秋季皇霊祭,Autumnal Kōreisai,Kōreisai
 R/1948-09-1{SolarTerms#term180}T00+09:00...2100,秋分の日,秋分の日,Autumnal Equinox Day,Autumnal Equinox Day
 R/1973-09-1{SolarTerms#term180+1&MO}T00+09:00...2100,振替休日,振替休日,Substitute holiday,Public holidays in Japan
+1929-10-02,皇大神宮遷御当日,神宮式年遷宮,Rebuilding the Ise Grand Shrine,Public holidays in Japan
 R/1966-10-10...2000,体育の日,体育の日,Health and Sports Day,Health and Sports Day
 R/1973-10-{11&MO}...2000,振替休日,振替休日,Substitute holiday,Public holidays in Japan
-R/2000-10-{2MO}...2100,体育の日,体育の日,Health and Sports Day,Health and Sports Day
+R/2000-10-{2MO}...2020,体育の日,体育の日,Health and Sports Day,Health and Sports Day
+R/2022-10-{2MO}...2100,スポーツの日,スポーツの日,National Sports Day,National Sports Day
 R/1879-10-17...1948,神嘗祭,神嘗祭,Kan'namesai,Public holidays in Japan
+2019-10-22,即位礼正殿の儀,即位礼正殿の儀,Enthronement of the Japanese Emperor,Enthronement of the Japanese Emperor
 R/1913-10-31...1927,天長節祝日,天皇誕生日,Emperor Taishō's Birth holiday,Public holidays in Japan
 R/1873-11-03...1912,天長節,天長節,The Emperor's Birthday,Public holidays in Japan
 R/1927-11-03...1948,明治節,明治節,The emperor Maiji's Birthday,Culture_Day
@@ -64,7 +81,7 @@ R/1948-11-03...2100,文化の日,文化の日,Culture Day,Culture Day
 R/1973-11-{4&MO}...2100,振替休日,振替休日,Substitute holiday,Public holidays in Japan
 1915-11-10,即位の礼,即位の礼,Enthronement of the Japanese Emperor,Enthronement of the Japanese Emperor
 1928-11-10,即位の礼,即位の礼,Enthronement of the Japanese Emperor,Enthronement of the Japanese Emperor
-1990-11-12,即位の礼正殿の儀,即位の礼,Enthronement of the Japanese Emperor,Enthronement of the Japanese Emperor
+1990-11-12,即位礼正殿の儀,即位礼正殿の儀,Enthronement of the Japanese Emperor,Enthronement of the Japanese Emperor
 1915-11-14,大嘗祭,大嘗祭,Enthronement of the Japanese Emperor,Enthronement of the Japanese Emperor
 1928-11-14,大嘗祭,大嘗祭,Enthronement of the Japanese Emperor,Enthronement of the Japanese Emperor
 1915-11-16,大饗第1日,大饗,Enthronement of the Japanese Emperor,Enthronement of the Japanese Emperor
@@ -72,6 +89,6 @@ R/1973-11-{4&MO}...2100,振替休日,振替休日,Substitute holiday,Public holi
 R/1873-11-23...1948,新嘗祭,新嘗祭,Labor Thanksgiving Day,Labor Thanksgiving Day
 R/1948-11-23...2100,勤労感謝の日,勤労感謝の日,Labor Thanksgiving Day,Labor Thanksgiving Day
 R/1973-11-{24&MO}...2100,振替休日,振替休日,Substitute holiday,Public holidays in Japan
-R/1989-12-23...2100,天皇誕生日,天皇誕生日,The Emperor's Birthday,Public holidays in Japan
-R/1989-12-{24&MO}...2100,振替休日,振替休日,Substitute holiday,Public holidays in Japan
+R/1989-12-23...2019,天皇誕生日,天皇誕生日,The Emperor's Birthday,Public holidays in Japan
+R/1989-12-{24&MO}...2019,振替休日,振替休日,Substitute holiday,Public holidays in Japan
 R/1927-12-25...1948,大正天皇祭,先帝祭,Emperor Taishō's Death anniversary,Public holidays in Japan

data/test/events/japanese-holiday.ttl

@@ -78,6 +78,26 @@ server:15 ts:dbpedia dbpedia:Public_holidays_in_Japan,
    dcq:valid "R/1973-02-{12&MO}...2100" .
 
 server:16 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:天皇誕生日;
+   ts:start 2458903;
+   ts:until 2488069;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E5%A4%A9%E7%9A%87%E8%AA%95%E7%94%9F%E6%97%A5;
+   dcq:abstract "The Emperor's Birthday",
+     "天皇誕生日"@ja;
+   dcq:valid "R/2020-02-23...2100" .
+
+server:17 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:振替休日;
+   ts:start 2458881;
+   ts:until 2488069;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
+   dcq:abstract "Substitute holiday",
+     "振替休日"@ja;
+   dcq:valid "R/2020-02-{24&MO}...2100" .
+
+server:18 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:大喪の礼;
    ts:start 2447582;
    ts:until 2447582;
@@ -87,7 +107,7 @@ server:16 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "昭和天皇の大喪の礼"@ja;
    dcq:valid "1989-02-24" .
 
-server:17 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:19 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:上巳;
    ts:start 2403418;
    ts:until 2405187;
@@ -97,7 +117,17 @@ server:17 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "弥生節句"@ja;
    dcq:valid "R/1868-03-03...1873^^Japanese" .
 
-server:18 ts:dbpedia dbpedia:K%C5%8Dreisai,
+server:2 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:四方拝;
+   ts:start 2405525;
+   ts:until 2432917;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E5%9B%9B%E6%96%B9%E6%8B%9D;
+   dcq:abstract "New Year's Day",
+     "四方拝"@ja;
+   dcq:valid "R/1874-01-01...1949" .
+
+server:20 ts:dbpedia dbpedia:K%C5%8Dreisai,
      dbpedia_ja:春季皇霊祭;
    ts:start 2407410;
    ts:until 2432917;
@@ -107,7 +137,7 @@ server:18 ts:dbpedia dbpedia:K%C5%8Dreisai,
      "春季皇霊祭"@ja;
    dcq:valid "R/1879-03-1{SolarTerms#term0}T00+09:00...1949" .
 
-server:19 ts:dbpedia dbpedia:Vernal_Equinox_Day,
+server:21 ts:dbpedia dbpedia:Vernal_Equinox_Day,
      dbpedia_ja:春分の日;
    ts:start 2432977;
    ts:until 2488069;
@@ -117,17 +147,7 @@ server:19 ts:dbpedia dbpedia:Vernal_Equinox_Day,
      "春分の日"@ja;
    dcq:valid "R/1949-03-1{SolarTerms#term0}T00+09:00...2100" .
 
-server:2 ts:dbpedia dbpedia:Public_holidays_in_Japan,
-     dbpedia_ja:四方拝;
-   ts:start 2405525;
-   ts:until 2432917;
-   dc:source wikipedia:Public_holidays_in_Japan,
-     wikipedia_ja:%E5%9B%9B%E6%96%B9%E6%8B%9D;
-   dcq:abstract "New Year's Day",
-     "四方拝"@ja;
-   dcq:valid "R/1874-01-01...1949" .
-
-server:20 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:22 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2441743;
    ts:until 2488069;
@@ -137,7 +157,7 @@ server:20 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/1973-03-1{SolarTerms#term0+1&MO}T00+09:00...2100" .
 
-server:21 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:23 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:神武天皇祭;
    ts:start 2405617;
    ts:until 2432917;
@@ -147,7 +167,7 @@ server:21 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "神武天皇祭"@ja;
    dcq:valid "R/1874-04-03...1949" .
 
-server:22 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:24 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:結婚の儀;
    ts:start 2436669;
    ts:until 2436669;
@@ -157,7 +177,7 @@ server:22 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "皇太子明仁親王の結婚の儀"@ja;
    dcq:valid "1959-04-10" .
 
-server:23 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:25 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:天長節;
    ts:start 2425000;
    ts:until 2432917;
@@ -167,7 +187,7 @@ server:23 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "天長節"@ja;
    dcq:valid "R/1927-04-29...1949" .
 
-server:24 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:26 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:天皇誕生日;
    ts:start 2433036;
    ts:until 2447527;
@@ -177,7 +197,7 @@ server:24 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "天皇誕生日"@ja;
    dcq:valid "R/1949-04-29...1989" .
 
-server:25 ts:dbpedia dbpedia:Greenery_Day,
+server:27 ts:dbpedia dbpedia:Greenery_Day,
      dbpedia_ja:みどりの日;
    ts:start 2447646;
    ts:until 2454101;
@@ -187,7 +207,7 @@ server:25 ts:dbpedia dbpedia:Greenery_Day,
      "みどりの日"@ja;
    dcq:valid "R/1989-04-29...2007" .
 
-server:26 ts:dbpedia dbpedia:Sh%C5%8Dwa_Day,
+server:28 ts:dbpedia dbpedia:Sh%C5%8Dwa_Day,
      dbpedia_ja:昭和の日;
    ts:start 2454220;
    ts:until 2488069;
@@ -197,7 +217,7 @@ server:26 ts:dbpedia dbpedia:Sh%C5%8Dwa_Day,
      "昭和の日"@ja;
    dcq:valid "R/2007-04-29...2100" .
 
-server:27 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:29 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2441774;
    ts:until 2488069;
@@ -207,7 +227,47 @@ server:27 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/1973-04-{30&MO}...2100" .
 
-server:28 ts:dbpedia dbpedia:Constitution_Memorial_Day,
+server:3 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:元日;
+   ts:start 2432918;
+   ts:until 2488069;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E5%85%83%E6%97%A5;
+   dcq:abstract "New Year's Day",
+     "元日"@ja;
+   dcq:valid "R/1949-01-01...2100" .
+
+server:30 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:国民の休日;
+   ts:start 2458604;
+   ts:until 2458604;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E5%9B%BD%E6%B0%91%E3%81%AE%E4%BC%91%E6%97%A5;
+   dcq:abstract "National Day Off",
+     "国民の休日"@ja;
+   dcq:valid "2019-04-30" .
+
+server:31 ts:dbpedia dbpedia:Coronation_Day_of_the_new_Emperor,
+     dbpedia_ja:即位の日;
+   ts:start 2458605;
+   ts:until 2458605;
+   dc:source wikipedia:Coronation_Day_of_the_new_Emperor,
+     wikipedia_ja:%E5%8D%B3%E4%BD%8D%E3%81%AE%E6%97%A5;
+   dcq:abstract "Coronation Day of the new Emperor",
+     "即位の日"@ja;
+   dcq:valid "2019-05-01" .
+
+server:32 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:国民の休日;
+   ts:start 2458606;
+   ts:until 2458606;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E5%9B%BD%E6%B0%91%E3%81%AE%E4%BC%91%E6%97%A5;
+   dcq:abstract "National Day Off",
+     "国民の休日"@ja;
+   dcq:valid "2019-05-02" .
+
+server:33 ts:dbpedia dbpedia:Constitution_Memorial_Day,
      dbpedia_ja:憲法記念日;
    ts:start 2433040;
    ts:until 2488069;
@@ -217,7 +277,7 @@ server:28 ts:dbpedia dbpedia:Constitution_Memorial_Day,
      "憲法記念日"@ja;
    dcq:valid "R/1949-05-03...2100" .
 
-server:29 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:34 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2441804;
    ts:until 2447161;
@@ -227,17 +287,7 @@ server:29 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/1973-05-{4&MO}...1988" .
 
-server:3 ts:dbpedia dbpedia:Public_holidays_in_Japan,
-     dbpedia_ja:元日;
-   ts:start 2432918;
-   ts:until 2488069;
-   dc:source wikipedia:Public_holidays_in_Japan,
-     wikipedia_ja:%E5%85%83%E6%97%A5;
-   dcq:abstract "New Year's Day",
-     "元日"@ja;
-   dcq:valid "R/1949-01-01...2100" .
-
-server:30 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:35 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:国民の休日;
    ts:start 2447286;
    ts:until 2454101;
@@ -247,7 +297,7 @@ server:30 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "国民の休日"@ja;
    dcq:valid "R/1988-05-04...2007" .
 
-server:31 ts:dbpedia dbpedia:Greenery_Day,
+server:36 ts:dbpedia dbpedia:Greenery_Day,
      dbpedia_ja:みどりの日;
    ts:start 2454225;
    ts:until 2488069;
@@ -257,7 +307,7 @@ server:31 ts:dbpedia dbpedia:Greenery_Day,
      "みどりの日"@ja;
    dcq:valid "R/2007-05-04...2100" .
 
-server:32 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:37 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:端午;
    ts:start 2403508;
    ts:until 2405187;
@@ -267,7 +317,7 @@ server:32 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "端午節句"@ja;
    dcq:valid "R/1868-05-05...1873^^Japanese" .
 
-server:33 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:38 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:こどもの日;
    ts:start 2433042;
    ts:until 2488069;
@@ -277,7 +327,7 @@ server:33 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "こどもの日"@ja;
    dcq:valid "R/1949-05-05...2100" .
 
-server:34 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:39 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2441804;
    ts:until 2454101;
@@ -287,7 +337,17 @@ server:34 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/1973-05-{6&MO}...2007" .
 
-server:35 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:4 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:振替休日;
+   ts:start 2441684;
+   ts:until 2488069;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
+   dcq:abstract "Substitute holiday",
+     "振替休日"@ja;
+   dcq:valid "R/1973-01-{2&MO}...2100" .
+
+server:40 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2454222;
    ts:until 2488069;
@@ -297,7 +357,7 @@ server:35 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/2007-05-{6&MO,TU,WE}...2100" .
 
-server:36 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:41 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:結婚の儀;
    ts:start 2449148;
    ts:until 2449148;
@@ -307,7 +367,7 @@ server:36 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "皇太子徳仁親王の結婚の儀"@ja;
    dcq:valid "1993-06-09" .
 
-server:37 ts:dbpedia dbpedia:Qixi_Festival,
+server:42 ts:dbpedia dbpedia:Qixi_Festival,
      dbpedia_ja:七夕;
    ts:start 2403569;
    ts:until 2405187;
@@ -317,7 +377,7 @@ server:37 ts:dbpedia dbpedia:Qixi_Festival,
      "七夕節句"@ja;
    dcq:valid "R/1868-07-07...1873^^Japanese" .
 
-server:38 ts:dbpedia dbpedia:Bon_Festival,
+server:43 ts:dbpedia dbpedia:Bon_Festival,
      dbpedia_ja:お盆;
    ts:start 2403577;
    ts:until 2405187;
@@ -327,7 +387,7 @@ server:38 ts:dbpedia dbpedia:Bon_Festival,
      "お盆"@ja;
    dcq:valid "R/1868-07-15...1873^^Japanese" .
 
-server:39 ts:dbpedia dbpedia:Marine_Day,
+server:44 ts:dbpedia dbpedia:Marine_Day,
      dbpedia_ja:海の日;
    ts:start 2450285;
    ts:until 2452640;
@@ -337,17 +397,7 @@ server:39 ts:dbpedia dbpedia:Marine_Day,
      "海の日"@ja;
    dcq:valid "R/1996-07-20...2003" .
 
-server:4 ts:dbpedia dbpedia:Public_holidays_in_Japan,
-     dbpedia_ja:振替休日;
-   ts:start 2441684;
-   ts:until 2488069;
-   dc:source wikipedia:Public_holidays_in_Japan,
-     wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
-   dcq:abstract "Substitute holiday",
-     "振替休日"@ja;
-   dcq:valid "R/1973-01-{2&MO}...2100" .
-
-server:40 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:45 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2450266;
    ts:until 2452640;
@@ -357,17 +407,77 @@ server:40 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/1996-07-{21&MO}...2003" .
 
-server:41 ts:dbpedia dbpedia:Marine_Day,
+server:46 ts:dbpedia dbpedia:Marine_Day,
      dbpedia_ja:海の日;
    ts:start 2452822;
+   ts:until 2458849;
+   dc:source wikipedia:Marine_Day,
+     wikipedia_ja:%E6%B5%B7%E3%81%AE%E6%97%A5;
+   dcq:abstract "Marine Day",
+     "海の日"@ja;
+   dcq:valid "R/2003-07-{3MO}...2020" .
+
+server:47 ts:dbpedia dbpedia:Marine_Day,
+     dbpedia_ja:海の日;
+   ts:start 2459762;
    ts:until 2488069;
    dc:source wikipedia:Marine_Day,
      wikipedia_ja:%E6%B5%B7%E3%81%AE%E6%97%A5;
    dcq:abstract "Marine Day",
      "海の日"@ja;
-   dcq:valid "R/2003-07-{3MO}...2100" .
+   dcq:valid "R/2022-07-{3MO}...2100" .
+
+server:48 ts:dbpedia dbpedia:Marine_Day,
+     dbpedia_ja:海の日;
+   ts:start 2459418;
+   ts:until 2459418;
+   dc:source wikipedia:Marine_Day,
+     wikipedia_ja:%E6%B5%B7%E3%81%AE%E6%97%A5;
+   dcq:abstract "Marine Day",
+     "海の日"@ja;
+   dcq:valid "2021-07-22" .
+
+server:49 ts:dbpedia dbpedia:Marine_Day,
+     dbpedia_ja:海の日;
+   ts:start 2459054;
+   ts:until 2459054;
+   dc:source wikipedia:Marine_Day,
+     wikipedia_ja:%E6%B5%B7%E3%81%AE%E6%97%A5;
+   dcq:abstract "Marine Day",
+     "海の日"@ja;
+   dcq:valid "2020-07-23" .
 
-server:42 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:5 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:元始祭;
+   ts:start 2405527;
+   ts:until 2432917;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E5%85%83%E5%A7%8B%E7%A5%AD;
+   dcq:abstract "New Year's Party",
+     "元始祭"@ja;
+   dcq:valid "R/1874-01-03...1949" .
+
+server:50 ts:dbpedia dbpedia:National_Sports_Day,
+     dbpedia_ja:スポーツの日;
+   ts:start 2459419;
+   ts:until 2459419;
+   dc:source wikipedia:National_Sports_Day,
+     wikipedia_ja:%E3%82%B9%E3%83%9D%E3%83%BC%E3%83%84%E3%81%AE%E6%97%A5;
+   dcq:abstract "National Sports Day",
+     "スポーツの日"@ja;
+   dcq:valid "2021-07-23" .
+
+server:51 ts:dbpedia dbpedia:National_Sports_Day,
+     dbpedia_ja:スポーツの日;
+   ts:start 2459055;
+   ts:until 2459055;
+   dc:source wikipedia:National_Sports_Day,
+     wikipedia_ja:%E3%82%B9%E3%83%9D%E3%83%BC%E3%83%84%E3%81%AE%E6%97%A5;
+   dcq:abstract "National Sports Day",
+     "スポーツの日"@ja;
+   dcq:valid "2020-07-24" .
+
+server:52 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:先帝祭;
    ts:start 2419979;
    ts:until 2424881;
@@ -377,7 +487,7 @@ server:42 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "明治天皇祭"@ja;
    dcq:valid "R/1913-07-30...1927" .
 
-server:43 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:53 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:八朔;
    ts:start 2403592;
    ts:until 2405187;
@@ -387,17 +497,57 @@ server:43 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "田実節句"@ja;
    dcq:valid "R/1868-08-01...1873^^Japanese" .
 
-server:44 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:54 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:山の日;
+   ts:start 2459435;
+   ts:until 2459435;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E5%B1%B1%E3%81%AE%E6%97%A5;
+   dcq:abstract "Mountain Day",
+     "山の日"@ja;
+   dcq:valid "2021-08-08" .
+
+server:55 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:振替休日;
+   ts:start 2459436;
+   ts:until 2459436;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
+   dcq:abstract "Substitute holiday",
+     "振替休日"@ja;
+   dcq:valid "2021-08-09" .
+
+server:56 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:山の日;
+   ts:start 2459072;
+   ts:until 2459072;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E5%B1%B1%E3%81%AE%E6%97%A5;
+   dcq:abstract "Mountain Day",
+     "山の日"@ja;
+   dcq:valid "2020-08-10" .
+
+server:57 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:山の日;
    ts:start 2457612;
+   ts:until 2458849;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E5%B1%B1%E3%81%AE%E6%97%A5;
+   dcq:abstract "Mountain Day",
+     "山の日"@ja;
+   dcq:valid "R/2016-08-11...2020" .
+
+server:58 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:山の日;
+   ts:start 2459803;
    ts:until 2488069;
    dc:source wikipedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%B1%B1%E3%81%AE%E6%97%A5;
    dcq:abstract "Mountain Day",
      "山の日"@ja;
-   dcq:valid "R/2016-08-11...2100" .
+   dcq:valid "R/2022-08-11...2100" .
 
-server:45 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:59 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2457602;
    ts:until 2488069;
@@ -407,7 +557,17 @@ server:45 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/2016-08-{12&MO}...2100" .
 
-server:46 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:6 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:新年宴会;
+   ts:start 2405529;
+   ts:until 2432917;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E6%96%B0%E5%B9%B4%E5%AE%B4%E4%BC%9A;
+   dcq:abstract "New Year's Party",
+     "新年宴会"@ja;
+   dcq:valid "R/1874-01-05...1949" .
+
+server:60 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:天長節;
    ts:start 2420011;
    ts:until 2424881;
@@ -417,7 +577,7 @@ server:46 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "天長節"@ja;
    dcq:valid "R/1913-08-31...1927" .
 
-server:47 ts:dbpedia dbpedia:Double_Ninth_Festival,
+server:61 ts:dbpedia dbpedia:Double_Ninth_Festival,
      dbpedia_ja:重陽節句;
    ts:start 2403630;
    ts:until 2405187;
@@ -427,7 +587,7 @@ server:47 ts:dbpedia dbpedia:Double_Ninth_Festival,
      "重陽節句"@ja;
    dcq:valid "R/1868-09-09...1873^^Japanese" .
 
-server:48 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
+server:62 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
      dbpedia_ja:敬老の日;
    ts:start 2439384;
    ts:until 2452640;
@@ -437,7 +597,7 @@ server:48 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
      "敬老の日"@ja;
    dcq:valid "R/1966-09-15...2003" .
 
-server:49 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:63 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2441927;
    ts:until 2452640;
@@ -447,17 +607,7 @@ server:49 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/1973-09-{16&MO}...2003" .
 
-server:5 ts:dbpedia dbpedia:Public_holidays_in_Japan,
-     dbpedia_ja:元始祭;
-   ts:start 2405527;
-   ts:until 2432917;
-   dc:source wikipedia:Public_holidays_in_Japan,
-     wikipedia_ja:%E5%85%83%E5%A7%8B%E7%A5%AD;
-   dcq:abstract "New Year's Party",
-     "元始祭"@ja;
-   dcq:valid "R/1874-01-03...1949" .
-
-server:50 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
+server:64 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
      dbpedia_ja:敬老の日;
    ts:start 2452884;
    ts:until 2488069;
@@ -467,7 +617,7 @@ server:50 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
      "敬老の日"@ja;
    dcq:valid "R/2003-09-{3MO}...2100" .
 
-server:51 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:65 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:神嘗祭;
    ts:start 2405784;
    ts:until 2407350;
@@ -477,7 +627,7 @@ server:51 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "神嘗祭"@ja;
    dcq:valid "R/1874-09-17...1879" .
 
-server:52 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:66 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:国民の休日;
    ts:start 2452884;
    ts:until 2488069;
@@ -487,7 +637,7 @@ server:52 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "国民の休日"@ja;
    dcq:valid "R/2003-09-1{SolarTerms#term180-1&TU}T00+09:00...2100" .
 
-server:53 ts:dbpedia dbpedia:K%C5%8Dreisai,
+server:67 ts:dbpedia dbpedia:K%C5%8Dreisai,
      dbpedia_ja:秋季皇霊祭;
    ts:start 2407229;
    ts:until 2432551;
@@ -497,7 +647,7 @@ server:53 ts:dbpedia dbpedia:K%C5%8Dreisai,
      "秋季皇霊祭"@ja;
    dcq:valid "R/1878-09-1{SolarTerms#term180}T00+09:00...1948" .
 
-server:54 ts:dbpedia dbpedia:Autumnal_Equinox_Day,
+server:68 ts:dbpedia dbpedia:Autumnal_Equinox_Day,
      dbpedia_ja:秋分の日;
    ts:start 2432796;
    ts:until 2488069;
@@ -507,7 +657,7 @@ server:54 ts:dbpedia dbpedia:Autumnal_Equinox_Day,
      "秋分の日"@ja;
    dcq:valid "R/1948-09-1{SolarTerms#term180}T00+09:00...2100" .
 
-server:55 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:69 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2441927;
    ts:until 2488069;
@@ -517,7 +667,27 @@ server:55 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/1973-09-1{SolarTerms#term180+1&MO}T00+09:00...2100" .
 
-server:56 ts:dbpedia dbpedia:Health_and_Sports_Day,
+server:7 ts:dbpedia dbpedia:Coming_of_Age_Day,
+     dbpedia_ja:成人の日;
+   ts:start 2451545;
+   ts:until 2488069;
+   dc:source wikipedia:Coming_of_Age_Day,
+     wikipedia_ja:%E6%88%90%E4%BA%BA%E3%81%AE%E6%97%A5;
+   dcq:abstract "Coming of Age Day",
+     "成人の日"@ja;
+   dcq:valid "R/2000-01-{2MO}...2100" .
+
+server:70 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+     dbpedia_ja:神宮式年遷宮;
+   ts:start 2425887;
+   ts:until 2425887;
+   dc:source wikipedia:Public_holidays_in_Japan,
+     wikipedia_ja:%E7%A5%9E%E5%AE%AE%E5%BC%8F%E5%B9%B4%E9%81%B7%E5%AE%AE;
+   dcq:abstract "Rebuilding the Ise Grand Shrine",
+     "皇大神宮遷御当日"@ja;
+   dcq:valid "1929-10-02" .
+
+server:71 ts:dbpedia dbpedia:Health_and_Sports_Day,
      dbpedia_ja:体育の日;
    ts:start 2439409;
    ts:until 2451544;
@@ -527,7 +697,7 @@ server:56 ts:dbpedia dbpedia:Health_and_Sports_Day,
      "体育の日"@ja;
    dcq:valid "R/1966-10-10...2000" .
 
-server:57 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:72 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2441957;
    ts:until 2451544;
@@ -537,17 +707,27 @@ server:57 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/1973-10-{11&MO}...2000" .
 
-server:58 ts:dbpedia dbpedia:Health_and_Sports_Day,
+server:73 ts:dbpedia dbpedia:Health_and_Sports_Day,
      dbpedia_ja:体育の日;
    ts:start 2451819;
-   ts:until 2488069;
+   ts:until 2458849;
    dc:source wikipedia:Health_and_Sports_Day,
      wikipedia_ja:%E4%BD%93%E8%82%B2%E3%81%AE%E6%97%A5;
    dcq:abstract "Health and Sports Day",
      "体育の日"@ja;
-   dcq:valid "R/2000-10-{2MO}...2100" .
+   dcq:valid "R/2000-10-{2MO}...2020" .
 
-server:59 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:74 ts:dbpedia dbpedia:National_Sports_Day,
+     dbpedia_ja:スポーツの日;
+   ts:start 2459854;
+   ts:until 2488069;
+   dc:source wikipedia:National_Sports_Day,
+     wikipedia_ja:%E3%82%B9%E3%83%9D%E3%83%BC%E3%83%84%E3%81%AE%E6%97%A5;
+   dcq:abstract "National Sports Day",
+     "スポーツの日"@ja;
+   dcq:valid "R/2022-10-{2MO}...2100" .
+
+server:75 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:神嘗祭;
    ts:start 2407640;
    ts:until 2432551;
@@ -557,17 +737,17 @@ server:59 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "神嘗祭"@ja;
    dcq:valid "R/1879-10-17...1948" .
 
-server:6 ts:dbpedia dbpedia:Public_holidays_in_Japan,
-     dbpedia_ja:新年宴会;
-   ts:start 2405529;
-   ts:until 2432917;
-   dc:source wikipedia:Public_holidays_in_Japan,
-     wikipedia_ja:%E6%96%B0%E5%B9%B4%E5%AE%B4%E4%BC%9A;
-   dcq:abstract "New Year's Party",
-     "新年宴会"@ja;
-   dcq:valid "R/1874-01-05...1949" .
+server:76 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
+     dbpedia_ja:即位礼正殿の儀;
+   ts:start 2458779;
+   ts:until 2458779;
+   dc:source wikipedia:Enthronement_of_the_Japanese_Emperor,
+     wikipedia_ja:%E5%8D%B3%E4%BD%8D%E7%A4%BC%E6%AD%A3%E6%AE%BF%E3%81%AE%E5%84%80;
+   dcq:abstract "Enthronement of the Japanese Emperor",
+     "即位礼正殿の儀"@ja;
+   dcq:valid "2019-10-22" .
 
-server:60 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:77 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:天皇誕生日;
    ts:start 2420072;
    ts:until 2424881;
@@ -577,7 +757,7 @@ server:60 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "天長節祝日"@ja;
    dcq:valid "R/1913-10-31...1927" .
 
-server:61 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:78 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:天長節;
    ts:start 2405466;
    ts:until 2419402;
@@ -587,7 +767,7 @@ server:61 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "天長節"@ja;
    dcq:valid "R/1873-11-03...1912" .
 
-server:62 ts:dbpedia dbpedia:Culture_Day,
+server:79 ts:dbpedia dbpedia:Culture_Day,
      dbpedia_ja:明治節;
    ts:start 2425188;
    ts:until 2432551;
@@ -597,7 +777,17 @@ server:62 ts:dbpedia dbpedia:Culture_Day,
      "明治節"@ja;
    dcq:valid "R/1927-11-03...1948" .
 
-server:63 ts:dbpedia dbpedia:Culture_Day,
+server:8 ts:dbpedia dbpedia:First_Full_Moon_Festival,
+     dbpedia_ja:小正月;
+   ts:start 2403371;
+   ts:until 2405187;
+   dc:source wikipedia:First_Full_Moon_Festival,
+     wikipedia_ja:%E5%B0%8F%E6%AD%A3%E6%9C%88;
+   dcq:abstract "First Full Moon Festival",
+     "小正月"@ja;
+   dcq:valid "R/1868-01-15...1873^^Japanese" .
+
+server:80 ts:dbpedia dbpedia:Culture_Day,
      dbpedia_ja:文化の日;
    ts:start 2432859;
    ts:until 2488069;
@@ -607,7 +797,7 @@ server:63 ts:dbpedia dbpedia:Culture_Day,
      "文化の日"@ja;
    dcq:valid "R/1948-11-03...2100" .
 
-server:64 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:81 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2441988;
    ts:until 2488069;
@@ -617,7 +807,7 @@ server:64 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/1973-11-{4&MO}...2100" .
 
-server:65 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
+server:82 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      dbpedia_ja:即位の礼;
    ts:start 2420812;
    ts:until 2420812;
@@ -627,7 +817,7 @@ server:65 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      "即位の礼"@ja;
    dcq:valid "1915-11-10" .
 
-server:66 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
+server:83 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      dbpedia_ja:即位の礼;
    ts:start 2425561;
    ts:until 2425561;
@@ -637,17 +827,17 @@ server:66 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      "即位の礼"@ja;
    dcq:valid "1928-11-10" .
 
-server:67 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
-     dbpedia_ja:即位の礼;
+server:84 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
+     dbpedia_ja:即位礼正殿の儀;
    ts:start 2448208;
    ts:until 2448208;
    dc:source wikipedia:Enthronement_of_the_Japanese_Emperor,
-     wikipedia_ja:%E5%8D%B3%E4%BD%8D%E3%81%AE%E7%A4%BC;
+     wikipedia_ja:%E5%8D%B3%E4%BD%8D%E7%A4%BC%E6%AD%A3%E6%AE%BF%E3%81%AE%E5%84%80;
    dcq:abstract "Enthronement of the Japanese Emperor",
-     "即位の礼正殿の儀"@ja;
+     "即位礼正殿の儀"@ja;
    dcq:valid "1990-11-12" .
 
-server:68 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
+server:85 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      dbpedia_ja:大嘗祭;
    ts:start 2420816;
    ts:until 2420816;
@@ -657,7 +847,7 @@ server:68 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      "大嘗祭"@ja;
    dcq:valid "1915-11-14" .
 
-server:69 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
+server:86 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      dbpedia_ja:大嘗祭;
    ts:start 2425565;
    ts:until 2425565;
@@ -667,17 +857,7 @@ server:69 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      "大嘗祭"@ja;
    dcq:valid "1928-11-14" .
 
-server:7 ts:dbpedia dbpedia:Coming_of_Age_Day,
-     dbpedia_ja:成人の日;
-   ts:start 2451545;
-   ts:until 2488069;
-   dc:source wikipedia:Coming_of_Age_Day,
-     wikipedia_ja:%E6%88%90%E4%BA%BA%E3%81%AE%E6%97%A5;
-   dcq:abstract "Coming of Age Day",
-     "成人の日"@ja;
-   dcq:valid "R/2000-01-{2MO}...2100" .
-
-server:70 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
+server:87 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      dbpedia_ja:大饗;
    ts:start 2420818;
    ts:until 2420818;
@@ -687,7 +867,7 @@ server:70 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      "大饗第1日"@ja;
    dcq:valid "1915-11-16" .
 
-server:71 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
+server:88 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      dbpedia_ja:大饗;
    ts:start 2425567;
    ts:until 2425567;
@@ -697,7 +877,7 @@ server:71 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      "大饗第1日"@ja;
    dcq:valid "1928-11-16" .
 
-server:72 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
+server:89 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
      dbpedia_ja:新嘗祭;
    ts:start 2405486;
    ts:until 2432551;
@@ -707,7 +887,17 @@ server:72 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
      "新嘗祭"@ja;
    dcq:valid "R/1873-11-23...1948" .
 
-server:73 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
+server:9 ts:dbpedia dbpedia:Coming_of_Age_Day,
+     dbpedia_ja:成人の日;
+   ts:start 2432932;
+   ts:until 2451544;
+   dc:source wikipedia:Coming_of_Age_Day,
+     wikipedia_ja:%E6%88%90%E4%BA%BA%E3%81%AE%E6%97%A5;
+   dcq:abstract "Coming of Age Day",
+     "成人の日"@ja;
+   dcq:valid "R/1949-01-15...2000" .
+
+server:90 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
      dbpedia_ja:勤労感謝の日;
    ts:start 2432879;
    ts:until 2488069;
@@ -717,7 +907,7 @@ server:73 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
      "勤労感謝の日"@ja;
    dcq:valid "R/1948-11-23...2100" .
 
-server:74 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:91 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2441988;
    ts:until 2488069;
@@ -727,27 +917,27 @@ server:74 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      "振替休日"@ja;
    dcq:valid "R/1973-11-{24&MO}...2100" .
 
-server:75 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:92 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:天皇誕生日;
    ts:start 2447884;
-   ts:until 2488069;
+   ts:until 2458484;
    dc:source wikipedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%A4%A9%E7%9A%87%E8%AA%95%E7%94%9F%E6%97%A5;
    dcq:abstract "The Emperor's Birthday",
      "天皇誕生日"@ja;
-   dcq:valid "R/1989-12-23...2100" .
+   dcq:valid "R/1989-12-23...2019" .
 
-server:76 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:93 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
    ts:start 2447862;
-   ts:until 2488069;
+   ts:until 2458484;
    dc:source wikipedia:Public_holidays_in_Japan,
      wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
    dcq:abstract "Substitute holiday",
      "振替休日"@ja;
-   dcq:valid "R/1989-12-{24&MO}...2100" .
+   dcq:valid "R/1989-12-{24&MO}...2019" .
 
-server:77 ts:dbpedia dbpedia:Public_holidays_in_Japan,
+server:94 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:先帝祭;
    ts:start 2425240;
    ts:until 2432551;
@@ -756,23 +946,3 @@ server:77 ts:dbpedia dbpedia:Public_holidays_in_Japan,
    dcq:abstract "Emperor Taishō's Death anniversary",
      "大正天皇祭"@ja;
    dcq:valid "R/1927-12-25...1948" .
-
-server:8 ts:dbpedia dbpedia:First_Full_Moon_Festival,
-     dbpedia_ja:小正月;
-   ts:start 2403371;
-   ts:until 2405187;
-   dc:source wikipedia:First_Full_Moon_Festival,
-     wikipedia_ja:%E5%B0%8F%E6%AD%A3%E6%9C%88;
-   dcq:abstract "First Full Moon Festival",
-     "小正月"@ja;
-   dcq:valid "R/1868-01-15...1873^^Japanese" .
-
-server:9 ts:dbpedia dbpedia:Coming_of_Age_Day,
-     dbpedia_ja:成人の日;
-   ts:start 2432932;
-   ts:until 2451544;
-   dc:source wikipedia:Coming_of_Age_Day,
-     wikipedia_ja:%E6%88%90%E4%BA%BA%E3%81%AE%E6%97%A5;
-   dcq:abstract "Coming of Age Day",
-     "成人の日"@ja;
-   dcq:valid "R/1949-01-15...2000" .