when_exe 0.4.5 → 0.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/bin/.pryrc +9 -0
  3. data/lib/when_exe.rb +10 -5
  4. data/lib/when_exe/basictypes.rb +5 -3
  5. data/lib/when_exe/calendartypes.rb +6 -38
  6. data/lib/when_exe/ephemeris.rb +42 -2
  7. data/lib/when_exe/ephemeris/eclipse.rb +8 -8
  8. data/lib/when_exe/ephemeris/notes.rb +29 -3
  9. data/lib/when_exe/ephemeris/phase_table.rb +825 -0
  10. data/lib/when_exe/ephemeris/term_table.rb +603 -0
  11. data/lib/when_exe/events.rb +73 -36
  12. data/lib/when_exe/icalendar.rb +7 -7
  13. data/lib/when_exe/inspect.rb +3 -3
  14. data/lib/when_exe/linkeddata.rb +1 -1
  15. data/lib/when_exe/parts/resource.rb +16 -4
  16. data/lib/when_exe/parts/timezone.rb +9 -6
  17. data/lib/when_exe/region/chinese.rb +5 -3
  18. data/lib/when_exe/region/indian.rb +2 -2
  19. data/lib/when_exe/region/japanese/notes.rb +4 -1
  20. data/lib/when_exe/timestandard.rb +1 -1
  21. data/lib/when_exe/tmposition.rb +24 -16
  22. data/lib/when_exe/tmptypes.rb +17 -3
  23. data/lib/when_exe/tmreference.rb +2 -2
  24. data/lib/when_exe/version.rb +1 -1
  25. data/test/events/japanese-holiday.ttl +67 -67
  26. data/test/test/region/mayan.rb +2 -1
  27. metadata +6 -2
data/lib/when_exe/tmptypes.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2011-2015 Takashi SUGA
3
+ Copyright (C) 2011-2016 Takashi SUGA
4
4
 
5
5
  You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
6
6
  =end
@@ -224,16 +224,30 @@ module When::TM
224
224
  #
225
225
  def parse(specification, options={})
226
226
  num, *calendars = specification.split(/\^{1,2}/)
227
- jdn = num.sub!(/[.@]/, '.') ? num.to_f : num.to_i
227
+ jdn = num.sub!(/[.@]/, '.') ? num.to_f : num.to_i
228
228
  case num
229
229
  when /MJD/i ; jdn += JDN_of_MJD
230
230
  when /CEP/i ; jdn += JDN_of_CEP
231
- when /DTB/i ; jdn = When.Resource('_t:UniversalTime').from_dynamical_date(jdn)
231
+ when /DTB/i ; jdn = time_standard(options).from_dynamical_date(jdn)
232
232
  end
233
233
  frame = calendars.shift || options[:frame]
234
234
  return self.new(jdn, options) unless frame
235
235
  calendars.unshift(frame).inject(jdn) {|date, calendar| When.Calendar(calendar).jul_trans(date, options)}
236
236
  end
237
+
238
+ private
239
+
240
+ #
241
+ # Time Standard を選択する
242
+ #
243
+ def time_standard(options)
244
+ ts = options[:time_standard]
245
+ ts ||= options[:clock] unless options[:clock].kind_of?(When::Parts::Timezone)
246
+ ts ||= '_t:UniversalTime'
247
+ ts = When.Resource(ts)
248
+ ts = ts.time_standard if ts.kind_of?(When::TM::Clock)
249
+ ts
250
+ end
237
251
  end
238
252
 
239
253
  # 加算
data/lib/when_exe/tmreference.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2011-2015 Takashi SUGA
3
+ Copyright (C) 2011-2016 Takashi SUGA
4
4
 
5
5
  You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
6
6
  =end
@@ -1746,7 +1746,7 @@ module When::TM
1746
1746
  end
1747
1747
  frame = epoch.frame
1748
1748
  cal_date = frame.to_cal_date(sdn)
1749
- options = {:frame=>frame}
1749
+ options = {:frame=>frame, :precision=>date.precision}
1750
1750
  return epoch, CalDate.new(cal_date, options) unless clock
1751
1751
  options[:clock] = clock
1752
1752
  options[:location] = date.location if date.location
data/lib/when_exe/version.rb CHANGED
@@ -6,7 +6,7 @@
6
6
  =end
7
7
 
8
8
  module When
9
- VERSION = "0.4.5"
9
+ VERSION = "0.4.6"
10
10
  YEARS = "(C) 2011-2016"
11
11
  AUTHOR = "Takashi SUGA"
12
12
  COPYRIGHT = "#{YEARS} #{AUTHOR}"
data/test/events/japanese-holiday.ttl CHANGED
@@ -15,7 +15,7 @@ server:1 ts:dbpedia dbpedia:Public_holidays_in_Japan,
15
15
  wikipedia_ja:%E5%85%83%E6%97%A6;
16
16
  dcq:abstract "New Year's Day",
17
17
  "元旦"@ja;
18
- dcq:valid "1868-01-01...1873" .
18
+ dcq:valid "R/1868-01-01...1873^^Japanese" .
19
19
 
20
20
  server:10 ts:dbpedia dbpedia:Public_holidays_in_Japan,
21
21
  dbpedia_ja:振替休日;
@@ -25,7 +25,7 @@ server:10 ts:dbpedia dbpedia:Public_holidays_in_Japan,
25
25
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
26
26
  dcq:abstract "Substitute holiday",
27
27
  "振替休日"@ja;
28
- dcq:valid "1973-01-01...2000" .
28
+ dcq:valid "R/1973-01-{16&MO}...2000" .
29
29
 
30
30
  server:11 ts:dbpedia dbpedia:National_Foundation_Day,
31
31
  dbpedia_ja:紀元節;
@@ -35,7 +35,7 @@ server:11 ts:dbpedia dbpedia:National_Foundation_Day,
35
35
  wikipedia_ja:%E7%B4%80%E5%85%83%E7%AF%80;
36
36
  dcq:abstract "National Foundation Day",
37
37
  "神武天皇即位日"@ja;
38
- dcq:valid "1873-01-29...1874" .
38
+ dcq:valid "R/1873-01-29...1874" .
39
39
 
40
40
  server:12 ts:dbpedia dbpedia:Public_holidays_in_Japan,
41
41
  dbpedia_ja:先帝祭;
@@ -45,7 +45,7 @@ server:12 ts:dbpedia dbpedia:Public_holidays_in_Japan,
45
45
  wikipedia_ja:%E5%85%88%E5%B8%9D%E7%A5%AD;
46
46
  dcq:abstract "Emperor Kōmei's Death anniversary",
47
47
  "孝明天皇祭"@ja;
48
- dcq:valid "1874-01-30...1913" .
48
+ dcq:valid "R/1874-01-30...1913" .
49
49
 
50
50
  server:13 ts:dbpedia dbpedia:National_Foundation_Day,
51
51
  dbpedia_ja:紀元節;
@@ -55,7 +55,7 @@ server:13 ts:dbpedia dbpedia:National_Foundation_Day,
55
55
  wikipedia_ja:%E7%B4%80%E5%85%83%E7%AF%80;
56
56
  dcq:abstract "National Foundation Day",
57
57
  "紀元節"@ja;
58
- dcq:valid "1874-02-11...1949" .
58
+ dcq:valid "R/1874-02-11...1949" .
59
59
 
60
60
  server:14 ts:dbpedia dbpedia:National_Foundation_Day,
61
61
  dbpedia_ja:建国記念の日;
@@ -65,7 +65,7 @@ server:14 ts:dbpedia dbpedia:National_Foundation_Day,
65
65
  wikipedia_ja:%E5%BB%BA%E5%9B%BD%E8%A8%98%E5%BF%B5%E3%81%AE%E6%97%A5;
66
66
  dcq:abstract "National Foundation Day",
67
67
  "建国記念の日"@ja;
68
- dcq:valid "1967-02-11...2100" .
68
+ dcq:valid "R/1967-02-11...2100" .
69
69
 
70
70
  server:15 ts:dbpedia dbpedia:Public_holidays_in_Japan,
71
71
  dbpedia_ja:振替休日;
@@ -75,7 +75,7 @@ server:15 ts:dbpedia dbpedia:Public_holidays_in_Japan,
75
75
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
76
76
  dcq:abstract "Substitute holiday",
77
77
  "振替休日"@ja;
78
- dcq:valid "1973-02-01...2100" .
78
+ dcq:valid "R/1973-02-{12&MO}...2100" .
79
79
 
80
80
  server:16 ts:dbpedia dbpedia:Public_holidays_in_Japan,
81
81
  dbpedia_ja:大喪の礼;
@@ -95,7 +95,7 @@ server:17 ts:dbpedia dbpedia:Public_holidays_in_Japan,
95
95
  wikipedia_ja:%E4%B8%8A%E5%B7%B3;
96
96
  dcq:abstract "Double Third Festival",
97
97
  "弥生節句"@ja;
98
- dcq:valid "1868-03-03...1873" .
98
+ dcq:valid "R/1868-03-03...1873^^Japanese" .
99
99
 
100
100
  server:18 ts:dbpedia dbpedia:K%C5%8Dreisai,
101
101
  dbpedia_ja:春季皇霊祭;
@@ -105,7 +105,7 @@ server:18 ts:dbpedia dbpedia:K%C5%8Dreisai,
105
105
  wikipedia_ja:%E6%98%A5%E5%AD%A3%E7%9A%87%E9%9C%8A%E7%A5%AD;
106
106
  dcq:abstract "Vernal Kōreisai",
107
107
  "春季皇霊祭"@ja;
108
- dcq:valid "1879-03-01T00+09:00...1949" .
108
+ dcq:valid "R/1879-03-1{SolarTerms#term0}T00+09:00...1949" .
109
109
 
110
110
  server:19 ts:dbpedia dbpedia:Vernal_Equinox_Day,
111
111
  dbpedia_ja:春分の日;
@@ -115,7 +115,7 @@ server:19 ts:dbpedia dbpedia:Vernal_Equinox_Day,
115
115
  wikipedia_ja:%E6%98%A5%E5%88%86%E3%81%AE%E6%97%A5;
116
116
  dcq:abstract "Vernal Equinox Day",
117
117
  "春分の日"@ja;
118
- dcq:valid "1949-03-01T00+09:00...2100" .
118
+ dcq:valid "R/1949-03-1{SolarTerms#term0}T00+09:00...2100" .
119
119
 
120
120
  server:2 ts:dbpedia dbpedia:Public_holidays_in_Japan,
121
121
  dbpedia_ja:四方拝;
@@ -125,7 +125,7 @@ server:2 ts:dbpedia dbpedia:Public_holidays_in_Japan,
125
125
  wikipedia_ja:%E5%9B%9B%E6%96%B9%E6%8B%9D;
126
126
  dcq:abstract "New Year's Day",
127
127
  "四方拝"@ja;
128
- dcq:valid "1874-01-01...1949" .
128
+ dcq:valid "R/1874-01-01...1949" .
129
129
 
130
130
  server:20 ts:dbpedia dbpedia:Public_holidays_in_Japan,
131
131
  dbpedia_ja:振替休日;
@@ -135,7 +135,7 @@ server:20 ts:dbpedia dbpedia:Public_holidays_in_Japan,
135
135
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
136
136
  dcq:abstract "Substitute holiday",
137
137
  "振替休日"@ja;
138
- dcq:valid "1973-03-01T00+09:00...2100" .
138
+ dcq:valid "R/1973-03-1{SolarTerms#term0+1&MO}T00+09:00...2100" .
139
139
 
140
140
  server:21 ts:dbpedia dbpedia:Public_holidays_in_Japan,
141
141
  dbpedia_ja:神武天皇祭;
@@ -145,7 +145,7 @@ server:21 ts:dbpedia dbpedia:Public_holidays_in_Japan,
145
145
  wikipedia_ja:%E7%A5%9E%E6%AD%A6%E5%A4%A9%E7%9A%87%E7%A5%AD;
146
146
  dcq:abstract "EmperorJimmu's Death anniversary",
147
147
  "神武天皇祭"@ja;
148
- dcq:valid "1874-04-03...1949" .
148
+ dcq:valid "R/1874-04-03...1949" .
149
149
 
150
150
  server:22 ts:dbpedia dbpedia:Public_holidays_in_Japan,
151
151
  dbpedia_ja:結婚の儀;
@@ -165,7 +165,7 @@ server:23 ts:dbpedia dbpedia:Public_holidays_in_Japan,
165
165
  wikipedia_ja:%E5%A4%A9%E9%95%B7%E7%AF%80;
166
166
  dcq:abstract "The Emperor's Birthday",
167
167
  "天長節"@ja;
168
- dcq:valid "1927-04-29...1949" .
168
+ dcq:valid "R/1927-04-29...1949" .
169
169
 
170
170
  server:24 ts:dbpedia dbpedia:Public_holidays_in_Japan,
171
171
  dbpedia_ja:天皇誕生日;
@@ -175,7 +175,7 @@ server:24 ts:dbpedia dbpedia:Public_holidays_in_Japan,
175
175
  wikipedia_ja:%E5%A4%A9%E7%9A%87%E8%AA%95%E7%94%9F%E6%97%A5;
176
176
  dcq:abstract "The Emperor's Birthday",
177
177
  "天皇誕生日"@ja;
178
- dcq:valid "1949-04-29...1989" .
178
+ dcq:valid "R/1949-04-29...1989" .
179
179
 
180
180
  server:25 ts:dbpedia dbpedia:Greenery_Day,
181
181
  dbpedia_ja:みどりの日;
@@ -185,7 +185,7 @@ server:25 ts:dbpedia dbpedia:Greenery_Day,
185
185
  wikipedia_ja:%E3%81%BF%E3%81%A9%E3%82%8A%E3%81%AE%E6%97%A5;
186
186
  dcq:abstract "Greenery Day",
187
187
  "みどりの日"@ja;
188
- dcq:valid "1989-04-29...2007" .
188
+ dcq:valid "R/1989-04-29...2007" .
189
189
 
190
190
  server:26 ts:dbpedia dbpedia:Sh%C5%8Dwa_Day,
191
191
  dbpedia_ja:昭和の日;
@@ -195,7 +195,7 @@ server:26 ts:dbpedia dbpedia:Sh%C5%8Dwa_Day,
195
195
  wikipedia_ja:%E6%98%AD%E5%92%8C%E3%81%AE%E6%97%A5;
196
196
  dcq:abstract "Shōwa Day",
197
197
  "昭和の日"@ja;
198
- dcq:valid "2007-04-29...2100" .
198
+ dcq:valid "R/2007-04-29...2100" .
199
199
 
200
200
  server:27 ts:dbpedia dbpedia:Public_holidays_in_Japan,
201
201
  dbpedia_ja:振替休日;
@@ -205,7 +205,7 @@ server:27 ts:dbpedia dbpedia:Public_holidays_in_Japan,
205
205
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
206
206
  dcq:abstract "Substitute holiday",
207
207
  "振替休日"@ja;
208
- dcq:valid "1973-04-01...2100" .
208
+ dcq:valid "R/1973-04-{30&MO}...2100" .
209
209
 
210
210
  server:28 ts:dbpedia dbpedia:Constitution_Memorial_Day,
211
211
  dbpedia_ja:憲法記念日;
@@ -215,7 +215,7 @@ server:28 ts:dbpedia dbpedia:Constitution_Memorial_Day,
215
215
  wikipedia_ja:%E6%86%B2%E6%B3%95%E8%A8%98%E5%BF%B5%E6%97%A5;
216
216
  dcq:abstract "Constitution Memorial Day",
217
217
  "憲法記念日"@ja;
218
- dcq:valid "1949-05-03...2100" .
218
+ dcq:valid "R/1949-05-03...2100" .
219
219
 
220
220
  server:29 ts:dbpedia dbpedia:Public_holidays_in_Japan,
221
221
  dbpedia_ja:振替休日;
@@ -225,7 +225,7 @@ server:29 ts:dbpedia dbpedia:Public_holidays_in_Japan,
225
225
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
226
226
  dcq:abstract "Substitute holiday",
227
227
  "振替休日"@ja;
228
- dcq:valid "1973-05-01...1988" .
228
+ dcq:valid "R/1973-05-{4&MO}...1988" .
229
229
 
230
230
  server:3 ts:dbpedia dbpedia:Public_holidays_in_Japan,
231
231
  dbpedia_ja:元日;
@@ -235,7 +235,7 @@ server:3 ts:dbpedia dbpedia:Public_holidays_in_Japan,
235
235
  wikipedia_ja:%E5%85%83%E6%97%A5;
236
236
  dcq:abstract "New Year's Day",
237
237
  "元日"@ja;
238
- dcq:valid "1949-01-01...2100" .
238
+ dcq:valid "R/1949-01-01...2100" .
239
239
 
240
240
  server:30 ts:dbpedia dbpedia:Public_holidays_in_Japan,
241
241
  dbpedia_ja:国民の休日;
@@ -245,7 +245,7 @@ server:30 ts:dbpedia dbpedia:Public_holidays_in_Japan,
245
245
  wikipedia_ja:%E5%9B%BD%E6%B0%91%E3%81%AE%E4%BC%91%E6%97%A5;
246
246
  dcq:abstract "National Day Off",
247
247
  "国民の休日"@ja;
248
- dcq:valid "1988-05-04...2007" .
248
+ dcq:valid "R/1988-05-04...2007" .
249
249
 
250
250
  server:31 ts:dbpedia dbpedia:Greenery_Day,
251
251
  dbpedia_ja:みどりの日;
@@ -255,7 +255,7 @@ server:31 ts:dbpedia dbpedia:Greenery_Day,
255
255
  wikipedia_ja:%E3%81%BF%E3%81%A9%E3%82%8A%E3%81%AE%E6%97%A5;
256
256
  dcq:abstract "Greenery Day",
257
257
  "みどりの日"@ja;
258
- dcq:valid "2007-05-04...2100" .
258
+ dcq:valid "R/2007-05-04...2100" .
259
259
 
260
260
  server:32 ts:dbpedia dbpedia:Public_holidays_in_Japan,
261
261
  dbpedia_ja:端午;
@@ -265,7 +265,7 @@ server:32 ts:dbpedia dbpedia:Public_holidays_in_Japan,
265
265
  wikipedia_ja:%E7%AB%AF%E5%8D%88;
266
266
  dcq:abstract "Double Fifth Festival",
267
267
  "端午節句"@ja;
268
- dcq:valid "1868-05-05...1873" .
268
+ dcq:valid "R/1868-05-05...1873^^Japanese" .
269
269
 
270
270
  server:33 ts:dbpedia dbpedia:Public_holidays_in_Japan,
271
271
  dbpedia_ja:こどもの日;
@@ -275,7 +275,7 @@ server:33 ts:dbpedia dbpedia:Public_holidays_in_Japan,
275
275
  wikipedia_ja:%E3%81%93%E3%81%A9%E3%82%82%E3%81%AE%E6%97%A5;
276
276
  dcq:abstract "Children's Day (Japan)",
277
277
  "こどもの日"@ja;
278
- dcq:valid "1949-05-05...2100" .
278
+ dcq:valid "R/1949-05-05...2100" .
279
279
 
280
280
  server:34 ts:dbpedia dbpedia:Public_holidays_in_Japan,
281
281
  dbpedia_ja:振替休日;
@@ -285,7 +285,7 @@ server:34 ts:dbpedia dbpedia:Public_holidays_in_Japan,
285
285
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
286
286
  dcq:abstract "Substitute holiday",
287
287
  "振替休日"@ja;
288
- dcq:valid "1973-05-01...2007" .
288
+ dcq:valid "R/1973-05-{6&MO}...2007" .
289
289
 
290
290
  server:35 ts:dbpedia dbpedia:Public_holidays_in_Japan,
291
291
  dbpedia_ja:振替休日;
@@ -295,7 +295,7 @@ server:35 ts:dbpedia dbpedia:Public_holidays_in_Japan,
295
295
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
296
296
  dcq:abstract "Substitute holiday",
297
297
  "振替休日"@ja;
298
- dcq:valid "2007-05-01...2100" .
298
+ dcq:valid "R/2007-05-{6&MO,TU,WE}...2100" .
299
299
 
300
300
  server:36 ts:dbpedia dbpedia:Public_holidays_in_Japan,
301
301
  dbpedia_ja:結婚の儀;
@@ -315,7 +315,7 @@ server:37 ts:dbpedia dbpedia:Qixi_Festival,
315
315
  wikipedia_ja:%E4%B8%83%E5%A4%95;
316
316
  dcq:abstract "Qixi Festival",
317
317
  "七夕節句"@ja;
318
- dcq:valid "1868-07-07...1873" .
318
+ dcq:valid "R/1868-07-07...1873^^Japanese" .
319
319
 
320
320
  server:38 ts:dbpedia dbpedia:Bon_Festival,
321
321
  dbpedia_ja:お盆;
@@ -325,7 +325,7 @@ server:38 ts:dbpedia dbpedia:Bon_Festival,
325
325
  wikipedia_ja:%E3%81%8A%E7%9B%86;
326
326
  dcq:abstract "Bon Festival",
327
327
  "お盆"@ja;
328
- dcq:valid "1868-07-15...1873" .
328
+ dcq:valid "R/1868-07-15...1873^^Japanese" .
329
329
 
330
330
  server:39 ts:dbpedia dbpedia:Marine_Day,
331
331
  dbpedia_ja:海の日;
@@ -335,7 +335,7 @@ server:39 ts:dbpedia dbpedia:Marine_Day,
335
335
  wikipedia_ja:%E6%B5%B7%E3%81%AE%E6%97%A5;
336
336
  dcq:abstract "Marine Day",
337
337
  "海の日"@ja;
338
- dcq:valid "1996-07-20...2003" .
338
+ dcq:valid "R/1996-07-20...2003" .
339
339
 
340
340
  server:4 ts:dbpedia dbpedia:Public_holidays_in_Japan,
341
341
  dbpedia_ja:振替休日;
@@ -345,7 +345,7 @@ server:4 ts:dbpedia dbpedia:Public_holidays_in_Japan,
345
345
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
346
346
  dcq:abstract "Substitute holiday",
347
347
  "振替休日"@ja;
348
- dcq:valid "1973-01-01...2100" .
348
+ dcq:valid "R/1973-01-{2&MO}...2100" .
349
349
 
350
350
  server:40 ts:dbpedia dbpedia:Public_holidays_in_Japan,
351
351
  dbpedia_ja:振替休日;
@@ -355,7 +355,7 @@ server:40 ts:dbpedia dbpedia:Public_holidays_in_Japan,
355
355
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
356
356
  dcq:abstract "Substitute holiday",
357
357
  "振替休日"@ja;
358
- dcq:valid "1996-07-01...2003" .
358
+ dcq:valid "R/1996-07-{21&MO}...2003" .
359
359
 
360
360
  server:41 ts:dbpedia dbpedia:Marine_Day,
361
361
  dbpedia_ja:海の日;
@@ -365,7 +365,7 @@ server:41 ts:dbpedia dbpedia:Marine_Day,
365
365
  wikipedia_ja:%E6%B5%B7%E3%81%AE%E6%97%A5;
366
366
  dcq:abstract "Marine Day",
367
367
  "海の日"@ja;
368
- dcq:valid "2003-07...2100" .
368
+ dcq:valid "R/2003-07-{3MO}...2100" .
369
369
 
370
370
  server:42 ts:dbpedia dbpedia:Public_holidays_in_Japan,
371
371
  dbpedia_ja:先帝祭;
@@ -375,7 +375,7 @@ server:42 ts:dbpedia dbpedia:Public_holidays_in_Japan,
375
375
  wikipedia_ja:%E5%85%88%E5%B8%9D%E7%A5%AD;
376
376
  dcq:abstract "Emperor Meiji's Death anniversary",
377
377
  "明治天皇祭"@ja;
378
- dcq:valid "1913-07-30...1927" .
378
+ dcq:valid "R/1913-07-30...1927" .
379
379
 
380
380
  server:43 ts:dbpedia dbpedia:Public_holidays_in_Japan,
381
381
  dbpedia_ja:八朔;
@@ -385,7 +385,7 @@ server:43 ts:dbpedia dbpedia:Public_holidays_in_Japan,
385
385
  wikipedia_ja:%E5%85%AB%E6%9C%94;
386
386
  dcq:abstract "Hassaku",
387
387
  "田実節句"@ja;
388
- dcq:valid "1868-08-01...1873" .
388
+ dcq:valid "R/1868-08-01...1873^^Japanese" .
389
389
 
390
390
  server:44 ts:dbpedia dbpedia:Public_holidays_in_Japan,
391
391
  dbpedia_ja:山の日;
@@ -395,7 +395,7 @@ server:44 ts:dbpedia dbpedia:Public_holidays_in_Japan,
395
395
  wikipedia_ja:%E5%B1%B1%E3%81%AE%E6%97%A5;
396
396
  dcq:abstract "Mountain Day",
397
397
  "山の日"@ja;
398
- dcq:valid "2016-08-11...2100" .
398
+ dcq:valid "R/2016-08-11...2100" .
399
399
 
400
400
  server:45 ts:dbpedia dbpedia:Public_holidays_in_Japan,
401
401
  dbpedia_ja:振替休日;
@@ -405,7 +405,7 @@ server:45 ts:dbpedia dbpedia:Public_holidays_in_Japan,
405
405
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
406
406
  dcq:abstract "Substitute holiday",
407
407
  "振替休日"@ja;
408
- dcq:valid "2016-08-01...2100" .
408
+ dcq:valid "R/2016-08-{12&MO}...2100" .
409
409
 
410
410
  server:46 ts:dbpedia dbpedia:Public_holidays_in_Japan,
411
411
  dbpedia_ja:天長節;
@@ -415,7 +415,7 @@ server:46 ts:dbpedia dbpedia:Public_holidays_in_Japan,
415
415
  wikipedia_ja:%E5%A4%A9%E9%95%B7%E7%AF%80;
416
416
  dcq:abstract "The Emperor's Birthday",
417
417
  "天長節"@ja;
418
- dcq:valid "1913-08-31...1927" .
418
+ dcq:valid "R/1913-08-31...1927" .
419
419
 
420
420
  server:47 ts:dbpedia dbpedia:Double_Ninth_Festival,
421
421
  dbpedia_ja:重陽節句;
@@ -425,7 +425,7 @@ server:47 ts:dbpedia dbpedia:Double_Ninth_Festival,
425
425
  wikipedia_ja:%E9%87%8D%E9%99%BD%E7%AF%80%E5%8F%A5;
426
426
  dcq:abstract "Double Ninth Festival",
427
427
  "重陽節句"@ja;
428
- dcq:valid "1868-09-09...1873" .
428
+ dcq:valid "R/1868-09-09...1873^^Japanese" .
429
429
 
430
430
  server:48 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
431
431
  dbpedia_ja:敬老の日;
@@ -435,7 +435,7 @@ server:48 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
435
435
  wikipedia_ja:%E6%95%AC%E8%80%81%E3%81%AE%E6%97%A5;
436
436
  dcq:abstract "Respect for the Aged Day",
437
437
  "敬老の日"@ja;
438
- dcq:valid "1966-09-15...2003" .
438
+ dcq:valid "R/1966-09-15...2003" .
439
439
 
440
440
  server:49 ts:dbpedia dbpedia:Public_holidays_in_Japan,
441
441
  dbpedia_ja:振替休日;
@@ -445,7 +445,7 @@ server:49 ts:dbpedia dbpedia:Public_holidays_in_Japan,
445
445
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
446
446
  dcq:abstract "Substitute holiday",
447
447
  "振替休日"@ja;
448
- dcq:valid "1973-09-01...2003" .
448
+ dcq:valid "R/1973-09-{16&MO}...2003" .
449
449
 
450
450
  server:5 ts:dbpedia dbpedia:Public_holidays_in_Japan,
451
451
  dbpedia_ja:元始祭;
@@ -455,7 +455,7 @@ server:5 ts:dbpedia dbpedia:Public_holidays_in_Japan,
455
455
  wikipedia_ja:%E5%85%83%E5%A7%8B%E7%A5%AD;
456
456
  dcq:abstract "New Year's Party",
457
457
  "元始祭"@ja;
458
- dcq:valid "1874-01-03...1949" .
458
+ dcq:valid "R/1874-01-03...1949" .
459
459
 
460
460
  server:50 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
461
461
  dbpedia_ja:敬老の日;
@@ -465,7 +465,7 @@ server:50 ts:dbpedia dbpedia:Respect_for_the_Aged_Day,
465
465
  wikipedia_ja:%E6%95%AC%E8%80%81%E3%81%AE%E6%97%A5;
466
466
  dcq:abstract "Respect for the Aged Day",
467
467
  "敬老の日"@ja;
468
- dcq:valid "2003-09...2100" .
468
+ dcq:valid "R/2003-09-{3MO}...2100" .
469
469
 
470
470
  server:51 ts:dbpedia dbpedia:Public_holidays_in_Japan,
471
471
  dbpedia_ja:神嘗祭;
@@ -475,7 +475,7 @@ server:51 ts:dbpedia dbpedia:Public_holidays_in_Japan,
475
475
  wikipedia_ja:%E7%A5%9E%E5%98%97%E7%A5%AD;
476
476
  dcq:abstract "Kan'namesai",
477
477
  "神嘗祭"@ja;
478
- dcq:valid "1874-09-17...1879" .
478
+ dcq:valid "R/1874-09-17...1879" .
479
479
 
480
480
  server:52 ts:dbpedia dbpedia:Public_holidays_in_Japan,
481
481
  dbpedia_ja:国民の休日;
@@ -485,7 +485,7 @@ server:52 ts:dbpedia dbpedia:Public_holidays_in_Japan,
485
485
  wikipedia_ja:%E5%9B%BD%E6%B0%91%E3%81%AE%E4%BC%91%E6%97%A5;
486
486
  dcq:abstract "National Day Off",
487
487
  "国民の休日"@ja;
488
- dcq:valid "2003-09-01T00+09:00...2100" .
488
+ dcq:valid "R/2003-09-1{SolarTerms#term180-1&TU}T00+09:00...2100" .
489
489
 
490
490
  server:53 ts:dbpedia dbpedia:K%C5%8Dreisai,
491
491
  dbpedia_ja:秋季皇霊祭;
@@ -495,7 +495,7 @@ server:53 ts:dbpedia dbpedia:K%C5%8Dreisai,
495
495
  wikipedia_ja:%E7%A7%8B%E5%AD%A3%E7%9A%87%E9%9C%8A%E7%A5%AD;
496
496
  dcq:abstract "Autumnal Kōreisai",
497
497
  "秋季皇霊祭"@ja;
498
- dcq:valid "1878-09-01T00+09:00...1948" .
498
+ dcq:valid "R/1878-09-1{SolarTerms#term180}T00+09:00...1948" .
499
499
 
500
500
  server:54 ts:dbpedia dbpedia:Autumnal_Equinox_Day,
501
501
  dbpedia_ja:秋分の日;
@@ -505,7 +505,7 @@ server:54 ts:dbpedia dbpedia:Autumnal_Equinox_Day,
505
505
  wikipedia_ja:%E7%A7%8B%E5%88%86%E3%81%AE%E6%97%A5;
506
506
  dcq:abstract "Autumnal Equinox Day",
507
507
  "秋分の日"@ja;
508
- dcq:valid "1948-09-01T00+09:00...2100" .
508
+ dcq:valid "R/1948-09-1{SolarTerms#term180}T00+09:00...2100" .
509
509
 
510
510
  server:55 ts:dbpedia dbpedia:Public_holidays_in_Japan,
511
511
  dbpedia_ja:振替休日;
@@ -515,7 +515,7 @@ server:55 ts:dbpedia dbpedia:Public_holidays_in_Japan,
515
515
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
516
516
  dcq:abstract "Substitute holiday",
517
517
  "振替休日"@ja;
518
- dcq:valid "1973-09-01T00+09:00...2100" .
518
+ dcq:valid "R/1973-09-1{SolarTerms#term180+1&MO}T00+09:00...2100" .
519
519
 
520
520
  server:56 ts:dbpedia dbpedia:Health_and_Sports_Day,
521
521
  dbpedia_ja:体育の日;
@@ -525,7 +525,7 @@ server:56 ts:dbpedia dbpedia:Health_and_Sports_Day,
525
525
  wikipedia_ja:%E4%BD%93%E8%82%B2%E3%81%AE%E6%97%A5;
526
526
  dcq:abstract "Health and Sports Day",
527
527
  "体育の日"@ja;
528
- dcq:valid "1966-10-10...2000" .
528
+ dcq:valid "R/1966-10-10...2000" .
529
529
 
530
530
  server:57 ts:dbpedia dbpedia:Public_holidays_in_Japan,
531
531
  dbpedia_ja:振替休日;
@@ -535,7 +535,7 @@ server:57 ts:dbpedia dbpedia:Public_holidays_in_Japan,
535
535
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
536
536
  dcq:abstract "Substitute holiday",
537
537
  "振替休日"@ja;
538
- dcq:valid "1973-10-01...2000" .
538
+ dcq:valid "R/1973-10-{11&MO}...2000" .
539
539
 
540
540
  server:58 ts:dbpedia dbpedia:Health_and_Sports_Day,
541
541
  dbpedia_ja:体育の日;
@@ -545,7 +545,7 @@ server:58 ts:dbpedia dbpedia:Health_and_Sports_Day,
545
545
  wikipedia_ja:%E4%BD%93%E8%82%B2%E3%81%AE%E6%97%A5;
546
546
  dcq:abstract "Health and Sports Day",
547
547
  "体育の日"@ja;
548
- dcq:valid "2000-10...2100" .
548
+ dcq:valid "R/2000-10-{2MO}...2100" .
549
549
 
550
550
  server:59 ts:dbpedia dbpedia:Public_holidays_in_Japan,
551
551
  dbpedia_ja:神嘗祭;
@@ -555,7 +555,7 @@ server:59 ts:dbpedia dbpedia:Public_holidays_in_Japan,
555
555
  wikipedia_ja:%E7%A5%9E%E5%98%97%E7%A5%AD;
556
556
  dcq:abstract "Kan'namesai",
557
557
  "神嘗祭"@ja;
558
- dcq:valid "1879-10-17...1948" .
558
+ dcq:valid "R/1879-10-17...1948" .
559
559
 
560
560
  server:6 ts:dbpedia dbpedia:Public_holidays_in_Japan,
561
561
  dbpedia_ja:新年宴会;
@@ -565,7 +565,7 @@ server:6 ts:dbpedia dbpedia:Public_holidays_in_Japan,
565
565
  wikipedia_ja:%E6%96%B0%E5%B9%B4%E5%AE%B4%E4%BC%9A;
566
566
  dcq:abstract "New Year's Party",
567
567
  "新年宴会"@ja;
568
- dcq:valid "1874-01-05...1949" .
568
+ dcq:valid "R/1874-01-05...1949" .
569
569
 
570
570
  server:60 ts:dbpedia dbpedia:Public_holidays_in_Japan,
571
571
  dbpedia_ja:天皇誕生日;
@@ -575,7 +575,7 @@ server:60 ts:dbpedia dbpedia:Public_holidays_in_Japan,
575
575
  wikipedia_ja:%E5%A4%A9%E7%9A%87%E8%AA%95%E7%94%9F%E6%97%A5;
576
576
  dcq:abstract "Emperor Taishō's Birth holiday",
577
577
  "天長節祝日"@ja;
578
- dcq:valid "1913-10-31...1927" .
578
+ dcq:valid "R/1913-10-31...1927" .
579
579
 
580
580
  server:61 ts:dbpedia dbpedia:Public_holidays_in_Japan,
581
581
  dbpedia_ja:天長節;
@@ -585,7 +585,7 @@ server:61 ts:dbpedia dbpedia:Public_holidays_in_Japan,
585
585
  wikipedia_ja:%E5%A4%A9%E9%95%B7%E7%AF%80;
586
586
  dcq:abstract "The Emperor's Birthday",
587
587
  "天長節"@ja;
588
- dcq:valid "1873-11-03...1912" .
588
+ dcq:valid "R/1873-11-03...1912" .
589
589
 
590
590
  server:62 ts:dbpedia dbpedia:Culture_Day,
591
591
  dbpedia_ja:明治節;
@@ -595,7 +595,7 @@ server:62 ts:dbpedia dbpedia:Culture_Day,
595
595
  wikipedia_ja:%E6%98%8E%E6%B2%BB%E7%AF%80;
596
596
  dcq:abstract "The emperor Maiji's Birthday",
597
597
  "明治節"@ja;
598
- dcq:valid "1927-11-03...1948" .
598
+ dcq:valid "R/1927-11-03...1948" .
599
599
 
600
600
  server:63 ts:dbpedia dbpedia:Culture_Day,
601
601
  dbpedia_ja:文化の日;
@@ -605,7 +605,7 @@ server:63 ts:dbpedia dbpedia:Culture_Day,
605
605
  wikipedia_ja:%E6%96%87%E5%8C%96%E3%81%AE%E6%97%A5;
606
606
  dcq:abstract "Culture Day",
607
607
  "文化の日"@ja;
608
- dcq:valid "1948-11-03...2100" .
608
+ dcq:valid "R/1948-11-03...2100" .
609
609
 
610
610
  server:64 ts:dbpedia dbpedia:Public_holidays_in_Japan,
611
611
  dbpedia_ja:振替休日;
@@ -615,7 +615,7 @@ server:64 ts:dbpedia dbpedia:Public_holidays_in_Japan,
615
615
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
616
616
  dcq:abstract "Substitute holiday",
617
617
  "振替休日"@ja;
618
- dcq:valid "1973-11-01...2100" .
618
+ dcq:valid "R/1973-11-{4&MO}...2100" .
619
619
 
620
620
  server:65 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
621
621
  dbpedia_ja:即位の礼;
@@ -675,7 +675,7 @@ server:7 ts:dbpedia dbpedia:Coming_of_Age_Day,
675
675
  wikipedia_ja:%E6%88%90%E4%BA%BA%E3%81%AE%E6%97%A5;
676
676
  dcq:abstract "Coming of Age Day",
677
677
  "成人の日"@ja;
678
- dcq:valid "2000-01...2100" .
678
+ dcq:valid "R/2000-01-{2MO}...2100" .
679
679
 
680
680
  server:70 ts:dbpedia dbpedia:Enthronement_of_the_Japanese_Emperor,
681
681
  dbpedia_ja:大饗;
@@ -705,7 +705,7 @@ server:72 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
705
705
  wikipedia_ja:%E6%96%B0%E5%98%97%E7%A5%AD;
706
706
  dcq:abstract "Labor Thanksgiving Day",
707
707
  "新嘗祭"@ja;
708
- dcq:valid "1873-11-23...1948" .
708
+ dcq:valid "R/1873-11-23...1948" .
709
709
 
710
710
  server:73 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
711
711
  dbpedia_ja:勤労感謝の日;
@@ -715,7 +715,7 @@ server:73 ts:dbpedia dbpedia:Labor_Thanksgiving_Day,
715
715
  wikipedia_ja:%E5%8B%A4%E5%8A%B4%E6%84%9F%E8%AC%9D%E3%81%AE%E6%97%A5;
716
716
  dcq:abstract "Labor Thanksgiving Day",
717
717
  "勤労感謝の日"@ja;
718
- dcq:valid "1948-11-23...2100" .
718
+ dcq:valid "R/1948-11-23...2100" .
719
719
 
720
720
  server:74 ts:dbpedia dbpedia:Public_holidays_in_Japan,
721
721
  dbpedia_ja:振替休日;
@@ -725,7 +725,7 @@ server:74 ts:dbpedia dbpedia:Public_holidays_in_Japan,
725
725
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
726
726
  dcq:abstract "Substitute holiday",
727
727
  "振替休日"@ja;
728
- dcq:valid "1973-11-01...2100" .
728
+ dcq:valid "R/1973-11-{24&MO}...2100" .
729
729
 
730
730
  server:75 ts:dbpedia dbpedia:Public_holidays_in_Japan,
731
731
  dbpedia_ja:天皇誕生日;
@@ -735,7 +735,7 @@ server:75 ts:dbpedia dbpedia:Public_holidays_in_Japan,
735
735
  wikipedia_ja:%E5%A4%A9%E7%9A%87%E8%AA%95%E7%94%9F%E6%97%A5;
736
736
  dcq:abstract "The Emperor's Birthday",
737
737
  "天皇誕生日"@ja;
738
- dcq:valid "1989-12-23...2100" .
738
+ dcq:valid "R/1989-12-23...2100" .
739
739
 
740
740
  server:76 ts:dbpedia dbpedia:Public_holidays_in_Japan,
741
741
  dbpedia_ja:振替休日;
@@ -745,7 +745,7 @@ server:76 ts:dbpedia dbpedia:Public_holidays_in_Japan,
745
745
  wikipedia_ja:%E6%8C%AF%E6%9B%BF%E4%BC%91%E6%97%A5;
746
746
  dcq:abstract "Substitute holiday",
747
747
  "振替休日"@ja;
748
- dcq:valid "1989-12-01...2100" .
748
+ dcq:valid "R/1989-12-{24&MO}...2100" .
749
749
 
750
750
  server:77 ts:dbpedia dbpedia:Public_holidays_in_Japan,
751
751
  dbpedia_ja:先帝祭;
@@ -755,7 +755,7 @@ server:77 ts:dbpedia dbpedia:Public_holidays_in_Japan,
755
755
  wikipedia_ja:%E5%85%88%E5%B8%9D%E7%A5%AD;
756
756
  dcq:abstract "Emperor Taishō's Death anniversary",
757
757
  "大正天皇祭"@ja;
758
- dcq:valid "1927-12-25...1948" .
758
+ dcq:valid "R/1927-12-25...1948" .
759
759
 
760
760
  server:8 ts:dbpedia dbpedia:First_Full_Moon_Festival,
761
761
  dbpedia_ja:小正月;
@@ -765,7 +765,7 @@ server:8 ts:dbpedia dbpedia:First_Full_Moon_Festival,
765
765
  wikipedia_ja:%E5%B0%8F%E6%AD%A3%E6%9C%88;
766
766
  dcq:abstract "First Full Moon Festival",
767
767
  "小正月"@ja;
768
- dcq:valid "1868-01-15...1873" .
768
+ dcq:valid "R/1868-01-15...1873^^Japanese" .
769
769
 
770
770
  server:9 ts:dbpedia dbpedia:Coming_of_Age_Day,
771
771
  dbpedia_ja:成人の日;
@@ -775,4 +775,4 @@ server:9 ts:dbpedia dbpedia:Coming_of_Age_Day,
775
775
  wikipedia_ja:%E6%88%90%E4%BA%BA%E3%81%AE%E6%97%A5;
776
776
  dcq:abstract "Coming of Age Day",
777
777
  "成人の日"@ja;
778
- dcq:valid "1949-01-15...2000" .
778
+ dcq:valid "R/1949-01-15...2000" .