On 2016-01-04 Mon 18:33 PM |, Jason McIntyre wrote:
>
> i guess you could propose a calendar.scotland addition. i'd be up for
> that ;)
>
After a wee discussion, I began a calendar.scotland addition.
As Scottish history goes back to 5000BC, well before the time of Noah
(so I found out while sailing around Loch Lomond's Inchlonaig this
"summer"), there are regional festivals in Scotland, which I've
ommitted as at this first attempt. Glasgow Fair, Dundee Fortnight,....
It quickly became obivious the major bits are common to the United Kingdom
as a whole, with variations for the kingdoms of England, Scotland &
Ireland (north only, as the south has left the union) + Wales.
So I instead had a stab at a calendar.united-kingdom file.
There was 1 wrong entry in calendar.holiday for Scotland & Ireland as
that bank holiday is common to Scotland & Southern Ireland, not
Northern. The correct entry for Scotland is now in the new UK file.
There are a number popular English holidays already in
calendar.christian - Pancake/Shrove Tuesday being the best.
Likewise for Scotland, there's loads of Keltic & Gaelic entries already
in calendar.pagan, which I've abandoned this time round.
Swapping poles; the New Zealand addition, the only problem was with the
provincial Marlborough Anniversary Day, which is observed on the first
Monday after Labour Day. I couldn't find any other entries for MonFith
or if it would roll over to the first Monday of the next month when
needed, so I left it on the *date.
The 5 summer Anniversary Days from January flop about to the nearest
Monday, forwards & backwards..... so they are *dates.
Index: calendar.holiday
===================================================================
RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.holiday,v
retrieving revision 1.33
diff -u -p -r1.33 calendar.holiday
--- calendar.holiday 5 Jan 2016 08:28:02 -0000 1.33
+++ calendar.holiday 6 Jan 2016 21:34:30 -0000
@@ -284,7 +284,6 @@
08/03 Independence Day in Jamaica, Niger
08/03 Memorial Day of Archbishop Makarios in Cyprus
08/04 Freedom Day in Guyana
-08/05* Bank Holiday in Scotland and Northern Ireland
08/06 Bank Holiday in Australia, British Columbia, Fiji, Iceland, Ireland,
Ontario
08/06 Emancipation Day in Bahamas
--- /dev/null Wed Jan 6 22:35:54 2016
+++ calendar.united-kingdom Wed Jan 6 21:30:48 2016
@@ -0,0 +1,45 @@
+/*
+ * United Kingdom holiday
+ *
+ * $OpenBSD$
+ */
+
+#ifndef _calendar_united-kingdom_
+#define _calendar_united-kingdom_
+
+01/01 New Year's Day (bank holiday)
+01/02 2nd January bank holiday in Scotland - another new year's holiday
+01/25 Burns' Night in Scotland
+02/14 Saint Valentine's Day
+03/01 Saint David's Day in Wales
+03/17 Saint Patrick's Day - bank holiday in Ireland
+03/20* Vernal Equinox
+03/SunLast Daylight Saving Time begins; clocks move forward (last Sunday
of March)
+04/01 April Fool's Day
+04/23 Saint George's Day in England
+Easter-21 Mothering Sunday (Sunday 3 weeks before Easter Sunday)
+Easter-2 Good Friday (bank holiday)
+Easter+1 Easter Monday (bank holiday - except Scotland)
+05/MonFirst May Bank Holiday
+05/MonThird* Victoria Day in Scotland (Monday on or immediately before May
24)
+05/MonLast Spring Bank Holiday
+06/SunThird Father's Day (3rd Sunday of June)
+06/21* Summer Solstice
+07/12 The Twelfth, Battle of the Boyne - bank holiday in Northern Ireland
+08/MonFirst Summer Bank Holiday in Scotland
+08/MonLast August Bank Holiday in England, Wales and Northern Ireland
+09/22* Autumnal Equinox
+10/SunLast Daylight Saving Time ends; clocks move back (last Sunday in
October)
+10/31 Halloween
+11/05 Guy Fawkes' Day
+11/11 Remembrance Day
+11/SunSecond Remembrance Sunday
+11/30 St. Andrew's Day - bank holiday in Scotland
+12/21* Winter Solstice
+12/24 Christmas Eve
+12/25 Christmas Day (bank holiday)
+12/26 Boxing Day (bank holiday)
+12/31 New Year's Eve
+12/31 Hogmanay - 3 day year transition festival in Scotland
+
+#endif /* !_calendar_united-kingdom_ */
--- /dev/null Wed Jan 6 22:36:13 2016
+++ calendar.new-zealand Wed Jan 6 22:33:45 2016
@@ -0,0 +1,47 @@
+/*
+ * New Zealand holiday
+ *
+ * $OpenBSD$
+ */
+
+#ifndef _calendar_new-zealand_
+#define _calendar_new-zealand_
+
+01/01 New Year's Day (public holiday)
+01/02 Day after New Year's Day (public holiday)
+01/22* Wellington Anniversary Day
+01/29* Auckland and Northland Anniversary Days
+02/01* Nelson Anniversary Day
+02/06* Waitangi Day (public holiday)
+02/14 Saint Valentine's Day
+03/20* Autumnal Equinox
+03/23* Otago Anniversary Day
+03/MonSecond New Plymouth Anniversary Day
+Easter-2 Good Friday (public holiday)
+Easter+1 Easter Monday (public holiday)
+Easter+2 Southland Anniversary Day
+04/01 April Fool's Day
+04/SunFirst Daylight Saving Time ends; clocks move back (first Sunday of
April)
+04/25* ANZAC Day
+05/SunSecond Mother's Day (2nd Sunday in May)
+06/MonFirst Queen's Birthday (public holiday, ski season begins)
+06/21* Winter Solstice
+09/SunFirst Father's Day (1st Sunday of September)
+09/22* Vernal Equinox
+09/MonFourth South Canterbury Anniversary Day
+09/SunLast Daylight Saving Time starts; clocks move forward (last Sunday
in September)
+09/FriThird Hawke's Bay Anniversary Day
+10/MonFourth Labour Day (public holiday)
+10/31 Halloween
+11/01* Marlborough Anniversary Day
+11/05 Guy Fawkes' Day
+11/30* Chatham Islands Anniversary Day
+12/01* Westland Anniversary Day
+12/16* South Canterbury Anniversary Day
+12/21* Summer Solstice
+12/24 Christmas Eve
+12/25 Christmas Day (public holiday)
+12/26 Boxing Day (public holiday)
+12/31 New Year's Eve
+
+#endif /* !_calendar_new-zealand_ */
