when_exe 0.4.5 → 0.4.6

data/lib/when_exe/tmptypes.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2016 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
@@ -224,16 +224,30 @@ module When::TM
       #
       def parse(specification, options={})
         num, *calendars = specification.split(/\^{1,2}/)
-        jdn   = num.sub!(/[.@]/, '.') ? num.to_f : num.to_i
+        jdn  = num.sub!(/[.@]/, '.') ? num.to_f : num.to_i
         case num
         when /MJD/i ; jdn += JDN_of_MJD
         when /CEP/i ; jdn += JDN_of_CEP
-        when /DTB/i ; jdn  = When.Resource('_t:UniversalTime').from_dynamical_date(jdn)
+        when /DTB/i ; jdn  = time_standard(options).from_dynamical_date(jdn)
         end
         frame = calendars.shift || options[:frame]
         return self.new(jdn, options) unless frame
         calendars.unshift(frame).inject(jdn) {|date, calendar| When.Calendar(calendar).jul_trans(date, options)}
       end
+
+      private
+
+      #
+      # Time Standard を選択する
+      #
+      def time_standard(options)
+        ts   = options[:time_standard]
+        ts ||= options[:clock] unless options[:clock].kind_of?(When::Parts::Timezone)
+        ts ||= '_t:UniversalTime'
+        ts   = When.Resource(ts)
+        ts   = ts.time_standard if ts.kind_of?(When::TM::Clock)
+        ts
+      end
     end
 
     # 加算

data/lib/when_exe/tmreference.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2016 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
@@ -1746,7 +1746,7 @@ module When::TM
       end
       frame     = epoch.frame
       cal_date  = frame.to_cal_date(sdn)
-      options   = {:frame=>frame}
+      options   = {:frame=>frame, :precision=>date.precision}
       return epoch, CalDate.new(cal_date, options) unless clock
       options[:clock]    = clock
       options[:location] = date.location if date.location

data/lib/when_exe/version.rb

@@ -6,7 +6,7 @@
 =end
 
 module When
-  VERSION   = "0.4.5"
+  VERSION   = "0.4.6"
   YEARS     = "(C) 2011-2016"
   AUTHOR    = "Takashi SUGA"
   COPYRIGHT = "#{YEARS} #{AUTHOR}"

data/test/events/japanese-holiday.ttl

@@ -15,7 +15,7 @@ server:1 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%85%83%E6%97%A6;
    dcq:abstract "New Year's Day",
      "元旦"@ja;
-   dcq:valid "1868-01-01...1873" .
+   dcq:valid "R/1868-01-01...1873^^Japanese" .
 
 server:10 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -25,7 +25,7 @@ server:10 ts:dbpedia dbpedia: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 "1973-01-01...2000" .
+   dcq:valid "R/1973-01-{16&MO}...2000" .
 
 server:11 ts:dbpedia dbpedia:National_Foundation_Day,
      dbpedia_ja:紀元節;
@@ -35,7 +35,7 @@ server:11 ts:dbpedia dbpedia:National_Foundation_Day,
      wikipedia_ja:%E7%B4%80%E5%85%83%E7%AF%80;
    dcq:abstract "National Foundation Day",
      "神武天皇即位日"@ja;
-   dcq:valid "1873-01-29...1874" .
+   dcq:valid "R/1873-01-29...1874" .
 
 server:12 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:先帝祭;
@@ -45,7 +45,7 @@ server:12 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%85%88%E5%B8%9D%E7%A5%AD;
    dcq:abstract "Emperor Kōmei's Death anniversary",
      "孝明天皇祭"@ja;
-   dcq:valid "1874-01-30...1913" .
+   dcq:valid "R/1874-01-30...1913" .
 
 server:13 ts:dbpedia dbpedia:National_Foundation_Day,
      dbpedia_ja:紀元節;
@@ -55,7 +55,7 @@ server:13 ts:dbpedia dbpedia:National_Foundation_Day,
      wikipedia_ja:%E7%B4%80%E5%85%83%E7%AF%80;
    dcq:abstract "National Foundation Day",
      "紀元節"@ja;
-   dcq:valid "1874-02-11...1949" .
+   dcq:valid "R/1874-02-11...1949" .
 
 server:14 ts:dbpedia dbpedia:National_Foundation_Day,
      dbpedia_ja:建国記念の日;
@@ -65,7 +65,7 @@ server:14 ts:dbpedia dbpedia:National_Foundation_Day,
      wikipedia_ja:%E5%BB%BA%E5%9B%BD%E8%A8%98%E5%BF%B5%E3%81%AE%E6%97%A5;
    dcq:abstract "National Foundation Day",
      "建国記念の日"@ja;
-   dcq:valid "1967-02-11...2100" .
+   dcq:valid "R/1967-02-11...2100" .
 
 server:15 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -75,7 +75,7 @@ server:15 ts:dbpedia dbpedia: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 "1973-02-01...2100" .
+   dcq:valid "R/1973-02-{12&MO}...2100" .
 
 server:16 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:大喪の礼;
@@ -95,7 +95,7 @@ server:17 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E4%B8%8A%E5%B7%B3;
    dcq:abstract "Double Third Festival",
      "弥生節句"@ja;
-   dcq:valid "1868-03-03...1873" .
+   dcq:valid "R/1868-03-03...1873^^Japanese" .
 
 server:18 ts:dbpedia dbpedia:K%C5%8Dreisai,
      dbpedia_ja:春季皇霊祭;
@@ -105,7 +105,7 @@ server:18 ts:dbpedia dbpedia:K%C5%8Dreisai,
      wikipedia_ja:%E6%98%A5%E5%AD%A3%E7%9A%87%E9%9C%8A%E7%A5%AD;
    dcq:abstract "Vernal Kōreisai",
      "春季皇霊祭"@ja;
-   dcq:valid "1879-03-01T00+09:00...1949" .
+   dcq:valid "R/1879-03-1{SolarTerms#term0}T00+09:00...1949" .
 
 server:19 ts:dbpedia dbpedia:Vernal_Equinox_Day,
      dbpedia_ja:春分の日;
@@ -115,7 +115,7 @@ server:19 ts:dbpedia dbpedia:Vernal_Equinox_Day,
      wikipedia_ja:%E6%98%A5%E5%88%86%E3%81%AE%E6%97%A5;
    dcq:abstract "Vernal Equinox Day",
      "春分の日"@ja;
-   dcq:valid "1949-03-01T00+09:00...2100" .
+   dcq:valid "R/1949-03-1{SolarTerms#term0}T00+09:00...2100" .
 
 server:2 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:四方拝;
@@ -125,7 +125,7 @@ server:2 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%9B%9B%E6%96%B9%E6%8B%9D;
    dcq:abstract "New Year's Day",
      "四方拝"@ja;
-   dcq:valid "1874-01-01...1949" .
+   dcq:valid "R/1874-01-01...1949" .
 
 server:20 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -135,7 +135,7 @@ server:20 ts:dbpedia dbpedia: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 "1973-03-01T00+09:00...2100" .
+   dcq:valid "R/1973-03-1{SolarTerms#term0+1&MO}T00+09:00...2100" .
 
 server:21 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:神武天皇祭;
@@ -145,7 +145,7 @@ server:21 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E7%A5%9E%E6%AD%A6%E5%A4%A9%E7%9A%87%E7%A5%AD;
    dcq:abstract "EmperorJimmu's Death anniversary",
      "神武天皇祭"@ja;
-   dcq:valid "1874-04-03...1949" .
+   dcq:valid "R/1874-04-03...1949" .
 
 server:22 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:結婚の儀;
@@ -165,7 +165,7 @@ server:23 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%A4%A9%E9%95%B7%E7%AF%80;
    dcq:abstract "The Emperor's Birthday",
      "天長節"@ja;
-   dcq:valid "1927-04-29...1949" .
+   dcq:valid "R/1927-04-29...1949" .
 
 server:24 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:天皇誕生日;
@@ -175,7 +175,7 @@ server:24 ts:dbpedia dbpedia: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 "1949-04-29...1989" .
+   dcq:valid "R/1949-04-29...1989" .
 
 server:25 ts:dbpedia dbpedia:Greenery_Day,
      dbpedia_ja:みどりの日;
@@ -185,7 +185,7 @@ server:25 ts:dbpedia dbpedia:Greenery_Day,
      wikipedia_ja:%E3%81%BF%E3%81%A9%E3%82%8A%E3%81%AE%E6%97%A5;
    dcq:abstract "Greenery Day",
      "みどりの日"@ja;
-   dcq:valid "1989-04-29...2007" .
+   dcq:valid "R/1989-04-29...2007" .
 
 server:26 ts:dbpedia dbpedia:Sh%C5%8Dwa_Day,
      dbpedia_ja:昭和の日;
@@ -195,7 +195,7 @@ server:26 ts:dbpedia dbpedia:Sh%C5%8Dwa_Day,
      wikipedia_ja:%E6%98%AD%E5%92%8C%E3%81%AE%E6%97%A5;
    dcq:abstract "Shōwa Day",
      "昭和の日"@ja;
-   dcq:valid "2007-04-29...2100" .
+   dcq:valid "R/2007-04-29...2100" .
 
 server:27 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -205,7 +205,7 @@ server:27 ts:dbpedia dbpedia: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 "1973-04-01...2100" .
+   dcq:valid "R/1973-04-{30&MO}...2100" .
 
 server:28 ts:dbpedia dbpedia:Constitution_Memorial_Day,
      dbpedia_ja:憲法記念日;
@@ -215,7 +215,7 @@ server:28 ts:dbpedia dbpedia:Constitution_Memorial_Day,
      wikipedia_ja:%E6%86%B2%E6%B3%95%E8%A8%98%E5%BF%B5%E6%97%A5;
    dcq:abstract "Constitution Memorial Day",
      "憲法記念日"@ja;
-   dcq:valid "1949-05-03...2100" .
+   dcq:valid "R/1949-05-03...2100" .
 
 server:29 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -225,7 +225,7 @@ server:29 ts:dbpedia dbpedia: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 "1973-05-01...1988" .
+   dcq:valid "R/1973-05-{4&MO}...1988" .
 
 server:3 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:元日;
@@ -235,7 +235,7 @@ server:3 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%85%83%E6%97%A5;
    dcq:abstract "New Year's Day",
      "元日"@ja;
-   dcq:valid "1949-01-01...2100" .
+   dcq:valid "R/1949-01-01...2100" .
 
 server:30 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:国民の休日;
@@ -245,7 +245,7 @@ server:30 ts:dbpedia dbpedia: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 "1988-05-04...2007" .
+   dcq:valid "R/1988-05-04...2007" .
 
 server:31 ts:dbpedia dbpedia:Greenery_Day,
      dbpedia_ja:みどりの日;
@@ -255,7 +255,7 @@ server:31 ts:dbpedia dbpedia:Greenery_Day,
      wikipedia_ja:%E3%81%BF%E3%81%A9%E3%82%8A%E3%81%AE%E6%97%A5;
    dcq:abstract "Greenery Day",
      "みどりの日"@ja;
-   dcq:valid "2007-05-04...2100" .
+   dcq:valid "R/2007-05-04...2100" .
 
 server:32 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:端午;
@@ -265,7 +265,7 @@ server:32 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E7%AB%AF%E5%8D%88;
    dcq:abstract "Double Fifth Festival",
      "端午節句"@ja;
-   dcq:valid "1868-05-05...1873" .
+   dcq:valid "R/1868-05-05...1873^^Japanese" .
 
 server:33 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:こどもの日;
@@ -275,7 +275,7 @@ server:33 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E3%81%93%E3%81%A9%E3%82%82%E3%81%AE%E6%97%A5;
    dcq:abstract "Children's Day (Japan)",
      "こどもの日"@ja;
-   dcq:valid "1949-05-05...2100" .
+   dcq:valid "R/1949-05-05...2100" .
 
 server:34 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -285,7 +285,7 @@ server:34 ts:dbpedia dbpedia: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 "1973-05-01...2007" .
+   dcq:valid "R/1973-05-{6&MO}...2007" .
 
 server:35 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -295,7 +295,7 @@ server:35 ts:dbpedia dbpedia: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 "2007-05-01...2100" .
+   dcq:valid "R/2007-05-{6&MO,TU,WE}...2100" .
 
 server:36 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:結婚の儀;
@@ -315,7 +315,7 @@ server:37 ts:dbpedia dbpedia:Qixi_Festival,
      wikipedia_ja:%E4%B8%83%E5%A4%95;
    dcq:abstract "Qixi Festival",
      "七夕節句"@ja;
-   dcq:valid "1868-07-07...1873" .
+   dcq:valid "R/1868-07-07...1873^^Japanese" .
 
 server:38 ts:dbpedia dbpedia:Bon_Festival,
      dbpedia_ja:お盆;
@@ -325,7 +325,7 @@ server:38 ts:dbpedia dbpedia:Bon_Festival,
      wikipedia_ja:%E3%81%8A%E7%9B%86;
    dcq:abstract "Bon Festival",
      "お盆"@ja;
-   dcq:valid "1868-07-15...1873" .
+   dcq:valid "R/1868-07-15...1873^^Japanese" .
 
 server:39 ts:dbpedia dbpedia:Marine_Day,
      dbpedia_ja:海の日;
@@ -335,7 +335,7 @@ server:39 ts:dbpedia dbpedia:Marine_Day,
      wikipedia_ja:%E6%B5%B7%E3%81%AE%E6%97%A5;
    dcq:abstract "Marine Day",
      "海の日"@ja;
-   dcq:valid "1996-07-20...2003" .
+   dcq:valid "R/1996-07-20...2003" .
 
 server:4 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -345,7 +345,7 @@ server:4 ts:dbpedia dbpedia: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 "1973-01-01...2100" .
+   dcq:valid "R/1973-01-{2&MO}...2100" .
 
 server:40 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -355,7 +355,7 @@ server:40 ts:dbpedia dbpedia: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 "1996-07-01...2003" .
+   dcq:valid "R/1996-07-{21&MO}...2003" .
 
 server:41 ts:dbpedia dbpedia:Marine_Day,
      dbpedia_ja:海の日;
@@ -365,7 +365,7 @@ server:41 ts:dbpedia dbpedia:Marine_Day,
      wikipedia_ja:%E6%B5%B7%E3%81%AE%E6%97%A5;
    dcq:abstract "Marine Day",
      "海の日"@ja;
-   dcq:valid "2003-07...2100" .
+   dcq:valid "R/2003-07-{3MO}...2100" .
 
 server:42 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:先帝祭;
@@ -375,7 +375,7 @@ server:42 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%85%88%E5%B8%9D%E7%A5%AD;
    dcq:abstract "Emperor Meiji's Death anniversary",
      "明治天皇祭"@ja;
-   dcq:valid "1913-07-30...1927" .
+   dcq:valid "R/1913-07-30...1927" .
 
 server:43 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:八朔;
@@ -385,7 +385,7 @@ server:43 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%85%AB%E6%9C%94;
    dcq:abstract "Hassaku",
      "田実節句"@ja;
-   dcq:valid "1868-08-01...1873" .
+   dcq:valid "R/1868-08-01...1873^^Japanese" .
 
 server:44 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:山の日;
@@ -395,7 +395,7 @@ server:44 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%B1%B1%E3%81%AE%E6%97%A5;
    dcq:abstract "Mountain Day",
      "山の日"@ja;
-   dcq:valid "2016-08-11...2100" .
+   dcq:valid "R/2016-08-11...2100" .
 
 server:45 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -405,7 +405,7 @@ server:45 ts:dbpedia dbpedia: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 "2016-08-01...2100" .
+   dcq:valid "R/2016-08-{12&MO}...2100" .
 
 server:46 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:天長節;
@@ -415,7 +415,7 @@ server:46 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%A4%A9%E9%95%B7%E7%AF%80;
    dcq:abstract "The Emperor's Birthday",
      "天長節"@ja;
-   dcq:valid "1913-08-31...1927" .
+   dcq:valid "R/1913-08-31...1927" .
 
 server:47 ts:dbpedia dbpedia:Double_Ninth_Festival,
      dbpedia_ja:重陽節句;
@@ -425,7 +425,7 @@ server:47 ts:dbpedia dbpedia:Double_Ninth_Festival,
      wikipedia_ja:%E9%87%8D%E9%99%BD%E7%AF%80%E5%8F%A5;
    dcq:abstract "Double Ninth Festival",
      "重陽節句"@ja;
-   dcq:valid "1868-09-09...1873" .
+   dcq:valid "R/1868-09-09...1873^^Japanese" .
 
 server:48 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
      dbpedia_ja:敬老の日;
@@ -435,7 +435,7 @@ server:48 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
      wikipedia_ja:%E6%95%AC%E8%80%81%E3%81%AE%E6%97%A5;
    dcq:abstract "Respect for the Aged Day",
      "敬老の日"@ja;
-   dcq:valid "1966-09-15...2003" .
+   dcq:valid "R/1966-09-15...2003" .
 
 server:49 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -445,7 +445,7 @@ server:49 ts:dbpedia dbpedia: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 "1973-09-01...2003" .
+   dcq:valid "R/1973-09-{16&MO}...2003" .
 
 server:5 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:元始祭;
@@ -455,7 +455,7 @@ server:5 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%85%83%E5%A7%8B%E7%A5%AD;
    dcq:abstract "New Year's Party",
      "元始祭"@ja;
-   dcq:valid "1874-01-03...1949" .
+   dcq:valid "R/1874-01-03...1949" .
 
 server:50 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
      dbpedia_ja:敬老の日;
@@ -465,7 +465,7 @@ server:50 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
      wikipedia_ja:%E6%95%AC%E8%80%81%E3%81%AE%E6%97%A5;
    dcq:abstract "Respect for the Aged Day",
      "敬老の日"@ja;
-   dcq:valid "2003-09...2100" .
+   dcq:valid "R/2003-09-{3MO}...2100" .
 
 server:51 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:神嘗祭;
@@ -475,7 +475,7 @@ server:51 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E7%A5%9E%E5%98%97%E7%A5%AD;
    dcq:abstract "Kan'namesai",
      "神嘗祭"@ja;
-   dcq:valid "1874-09-17...1879" .
+   dcq:valid "R/1874-09-17...1879" .
 
 server:52 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:国民の休日;
@@ -485,7 +485,7 @@ server:52 ts:dbpedia dbpedia: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 "2003-09-01T00+09:00...2100" .
+   dcq:valid "R/2003-09-1{SolarTerms#term180-1&TU}T00+09:00...2100" .
 
 server:53 ts:dbpedia dbpedia:K%C5%8Dreisai,
      dbpedia_ja:秋季皇霊祭;
@@ -495,7 +495,7 @@ server:53 ts:dbpedia dbpedia:K%C5%8Dreisai,
      wikipedia_ja:%E7%A7%8B%E5%AD%A3%E7%9A%87%E9%9C%8A%E7%A5%AD;
    dcq:abstract "Autumnal Kōreisai",
      "秋季皇霊祭"@ja;
-   dcq:valid "1878-09-01T00+09:00...1948" .
+   dcq:valid "R/1878-09-1{SolarTerms#term180}T00+09:00...1948" .
 
 server:54 ts:dbpedia dbpedia:Autumnal_Equinox_Day,
      dbpedia_ja:秋分の日;
@@ -505,7 +505,7 @@ server:54 ts:dbpedia dbpedia:Autumnal_Equinox_Day,
      wikipedia_ja:%E7%A7%8B%E5%88%86%E3%81%AE%E6%97%A5;
    dcq:abstract "Autumnal Equinox Day",
      "秋分の日"@ja;
-   dcq:valid "1948-09-01T00+09:00...2100" .
+   dcq:valid "R/1948-09-1{SolarTerms#term180}T00+09:00...2100" .
 
 server:55 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -515,7 +515,7 @@ server:55 ts:dbpedia dbpedia: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 "1973-09-01T00+09:00...2100" .
+   dcq:valid "R/1973-09-1{SolarTerms#term180+1&MO}T00+09:00...2100" .
 
 server:56 ts:dbpedia dbpedia:Health_and_Sports_Day,
      dbpedia_ja:体育の日;
@@ -525,7 +525,7 @@ server:56 ts:dbpedia dbpedia: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 "1966-10-10...2000" .
+   dcq:valid "R/1966-10-10...2000" .
 
 server:57 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -535,7 +535,7 @@ server:57 ts:dbpedia dbpedia: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 "1973-10-01...2000" .
+   dcq:valid "R/1973-10-{11&MO}...2000" .
 
 server:58 ts:dbpedia dbpedia:Health_and_Sports_Day,
      dbpedia_ja:体育の日;
@@ -545,7 +545,7 @@ server:58 ts:dbpedia dbpedia: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 "2000-10...2100" .
+   dcq:valid "R/2000-10-{2MO}...2100" .
 
 server:59 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:神嘗祭;
@@ -555,7 +555,7 @@ server:59 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E7%A5%9E%E5%98%97%E7%A5%AD;
    dcq:abstract "Kan'namesai",
      "神嘗祭"@ja;
-   dcq:valid "1879-10-17...1948" .
+   dcq:valid "R/1879-10-17...1948" .
 
 server:6 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:新年宴会;
@@ -565,7 +565,7 @@ server:6 ts:dbpedia dbpedia: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 "1874-01-05...1949" .
+   dcq:valid "R/1874-01-05...1949" .
 
 server:60 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:天皇誕生日;
@@ -575,7 +575,7 @@ server:60 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%A4%A9%E7%9A%87%E8%AA%95%E7%94%9F%E6%97%A5;
    dcq:abstract "Emperor Taishō's Birth holiday",
      "天長節祝日"@ja;
-   dcq:valid "1913-10-31...1927" .
+   dcq:valid "R/1913-10-31...1927" .
 
 server:61 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:天長節;
@@ -585,7 +585,7 @@ server:61 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%A4%A9%E9%95%B7%E7%AF%80;
    dcq:abstract "The Emperor's Birthday",
      "天長節"@ja;
-   dcq:valid "1873-11-03...1912" .
+   dcq:valid "R/1873-11-03...1912" .
 
 server:62 ts:dbpedia dbpedia:Culture_Day,
      dbpedia_ja:明治節;
@@ -595,7 +595,7 @@ server:62 ts:dbpedia dbpedia:Culture_Day,
      wikipedia_ja:%E6%98%8E%E6%B2%BB%E7%AF%80;
    dcq:abstract "The emperor Maiji's Birthday",
      "明治節"@ja;
-   dcq:valid "1927-11-03...1948" .
+   dcq:valid "R/1927-11-03...1948" .
 
 server:63 ts:dbpedia dbpedia:Culture_Day,
      dbpedia_ja:文化の日;
@@ -605,7 +605,7 @@ server:63 ts:dbpedia dbpedia:Culture_Day,
      wikipedia_ja:%E6%96%87%E5%8C%96%E3%81%AE%E6%97%A5;
    dcq:abstract "Culture Day",
      "文化の日"@ja;
-   dcq:valid "1948-11-03...2100" .
+   dcq:valid "R/1948-11-03...2100" .
 
 server:64 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -615,7 +615,7 @@ server:64 ts:dbpedia dbpedia: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 "1973-11-01...2100" .
+   dcq:valid "R/1973-11-{4&MO}...2100" .
 
 server:65 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      dbpedia_ja:即位の礼;
@@ -675,7 +675,7 @@ server:7 ts:dbpedia dbpedia: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 "2000-01...2100" .
+   dcq:valid "R/2000-01-{2MO}...2100" .
 
 server:70 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
      dbpedia_ja:大饗;
@@ -705,7 +705,7 @@ server:72 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
      wikipedia_ja:%E6%96%B0%E5%98%97%E7%A5%AD;
    dcq:abstract "Labor Thanksgiving Day",
      "新嘗祭"@ja;
-   dcq:valid "1873-11-23...1948" .
+   dcq:valid "R/1873-11-23...1948" .
 
 server:73 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
      dbpedia_ja:勤労感謝の日;
@@ -715,7 +715,7 @@ server:73 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
      wikipedia_ja:%E5%8B%A4%E5%8A%B4%E6%84%9F%E8%AC%9D%E3%81%AE%E6%97%A5;
    dcq:abstract "Labor Thanksgiving Day",
      "勤労感謝の日"@ja;
-   dcq:valid "1948-11-23...2100" .
+   dcq:valid "R/1948-11-23...2100" .
 
 server:74 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -725,7 +725,7 @@ server:74 ts:dbpedia dbpedia: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 "1973-11-01...2100" .
+   dcq:valid "R/1973-11-{24&MO}...2100" .
 
 server:75 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:天皇誕生日;
@@ -735,7 +735,7 @@ server:75 ts:dbpedia dbpedia: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 "1989-12-23...2100" .
+   dcq:valid "R/1989-12-23...2100" .
 
 server:76 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:振替休日;
@@ -745,7 +745,7 @@ server:76 ts:dbpedia dbpedia: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 "1989-12-01...2100" .
+   dcq:valid "R/1989-12-{24&MO}...2100" .
 
 server:77 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      dbpedia_ja:先帝祭;
@@ -755,7 +755,7 @@ server:77 ts:dbpedia dbpedia:Public_holidays_in_Japan,
      wikipedia_ja:%E5%85%88%E5%B8%9D%E7%A5%AD;
    dcq:abstract "Emperor Taishō's Death anniversary",
      "大正天皇祭"@ja;
-   dcq:valid "1927-12-25...1948" .
+   dcq:valid "R/1927-12-25...1948" .
 
 server:8 ts:dbpedia dbpedia:First_Full_Moon_Festival,
      dbpedia_ja:小正月;
@@ -765,7 +765,7 @@ server:8 ts:dbpedia dbpedia:First_Full_Moon_Festival,
      wikipedia_ja:%E5%B0%8F%E6%AD%A3%E6%9C%88;
    dcq:abstract "First Full Moon Festival",
      "小正月"@ja;
-   dcq:valid "1868-01-15...1873" .
+   dcq:valid "R/1868-01-15...1873^^Japanese" .
 
 server:9 ts:dbpedia dbpedia:Coming_of_Age_Day,
      dbpedia_ja:成人の日;
@@ -775,4 +775,4 @@ server:9 ts:dbpedia dbpedia: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 "1949-01-15...2000" .
+   dcq:valid "R/1949-01-15...2000" .