[DIFF] New Year's calendar

classic Classic list List threaded Threaded
16 messages Options
Reply | Threaded
Open this post in threaded view
|

[DIFF] New Year's calendar

Craig Skinner-3
Happy Hogmanay/New Year!

Scotland & New Zealand have an additional New Year's celebrations
hangover recovery public holiday.

In Scotland, Hogmanay is THE most significant winter festival, with
internationally popular street parties of 400,000 people dancing.

(Xmas was banned in Scotland for over 400 years, until recently.)


Index: calendar.holiday
===================================================================
RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.holiday,v
retrieving revision 1.32
diff -u -p -r1.32 calendar.holiday
--- calendar.holiday 12 Oct 2015 06:33:21 -0000 1.32
+++ calendar.holiday 4 Jan 2016 15:44:21 -0000
@@ -12,7 +12,7 @@
 01/01 Universal Fraternity Day in Mozambique
 01/02 Ancestry Day in Haiti
 01/02 St. Berchtold's Day in Switzerland
-01/03 New Year's Holiday in Scotland
+01/02 New Year's Holiday in Scotland and New Zealand
 01/03 Revolution Day in Upper Volta
 01/04 Independence Day in Burma
 01/04 Martyrs Day in Zaire
@@ -580,5 +580,6 @@
 12/29 His Majesty, the King's Birthday in Nepal
 12/30 Anniversary of the Democratic Republic of Madagascar in Madagascar
 12/31 Proclamation of the Republic in Congo
+12/31 Hogmanay - 3 day year transition festival in Scotland
 
 #endif /* !_calendar_holiday_ */


--
http://www.Scotland.org/features/hogmanay-top-facts/
http://www.RampantScotland.com/know/blknow12.htm
http://www.EdinburghsHogmanay.com/
http://www.EdinburghFestivalCity.com/festivals/edinburghs-hogmanay
http://en.wikipedia.org/wiki/Hogmanay

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Jason McIntyre-2
On Mon, Jan 04, 2016 at 03:46:53PM +0000, Craig Skinner wrote:

> Happy Hogmanay/New Year!
>
> Scotland & New Zealand have an additional New Year's celebrations
> hangover recovery public holiday.
>
> In Scotland, Hogmanay is THE most significant winter festival, with
> internationally popular street parties of 400,000 people dancing.
>
> (Xmas was banned in Scotland for over 400 years, until recently.)
>

i diasgree with this. it's true some of us in scotland get the 2nd off,
but i'm not sure it's helpful to describe the 2nd as a new year's
festival.

really we have hogmany and new year's day. depending on your job, you'll
get some combination of these off. i worked 31/1 and had the second off.
lots of people have two weeks...

traditionally the 2nd was described as a bank holiday. now banks are
open on this day. some businesses shut.

let's just leave it that for people on this calendar, 31st is hogmany
and the 1st is new year's day. days off are no longer inviolate/

jmc

ps xmas banned in scotland till recently: how old are you exactly, craig ;)

>
> Index: calendar.holiday
> ===================================================================
> RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.holiday,v
> retrieving revision 1.32
> diff -u -p -r1.32 calendar.holiday
> --- calendar.holiday 12 Oct 2015 06:33:21 -0000 1.32
> +++ calendar.holiday 4 Jan 2016 15:44:21 -0000
> @@ -12,7 +12,7 @@
>  01/01 Universal Fraternity Day in Mozambique
>  01/02 Ancestry Day in Haiti
>  01/02 St. Berchtold's Day in Switzerland
> -01/03 New Year's Holiday in Scotland
> +01/02 New Year's Holiday in Scotland and New Zealand
>  01/03 Revolution Day in Upper Volta
>  01/04 Independence Day in Burma
>  01/04 Martyrs Day in Zaire
> @@ -580,5 +580,6 @@
>  12/29 His Majesty, the King's Birthday in Nepal
>  12/30 Anniversary of the Democratic Republic of Madagascar in Madagascar
>  12/31 Proclamation of the Republic in Congo
> +12/31 Hogmanay - 3 day year transition festival in Scotland
>  
>  #endif /* !_calendar_holiday_ */
>
>
> --
> http://www.Scotland.org/features/hogmanay-top-facts/
> http://www.RampantScotland.com/know/blknow12.htm
> http://www.EdinburghsHogmanay.com/
> http://www.EdinburghFestivalCity.com/festivals/edinburghs-hogmanay
> http://en.wikipedia.org/wiki/Hogmanay

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Jason McIntyre-2
On Mon, Jan 04, 2016 at 06:11:58PM +0000, Jason McIntyre wrote:

> On Mon, Jan 04, 2016 at 03:46:53PM +0000, Craig Skinner wrote:
> > Happy Hogmanay/New Year!
> >
> > Scotland & New Zealand have an additional New Year's celebrations
> > hangover recovery public holiday.
> >
> > In Scotland, Hogmanay is THE most significant winter festival, with
> > internationally popular street parties of 400,000 people dancing.
> >
> > (Xmas was banned in Scotland for over 400 years, until recently.)
> >
>
> i diasgree with this. it's true some of us in scotland get the 2nd off,
> but i'm not sure it's helpful to describe the 2nd as a new year's
> festival.
>
> really we have hogmany and new year's day. depending on your job, you'll
> get some combination of these off. i worked 31/1 and had the second off.
> lots of people have two weeks...
>
> traditionally the 2nd was described as a bank holiday. now banks are
> open on this day. some businesses shut.
>
> let's just leave it that for people on this calendar, 31st is hogmany
> and the 1st is new year's day. days off are no longer inviolate/
>
> jmc
>
> ps xmas banned in scotland till recently: how old are you exactly, craig ;)
>

i just spotted that for some reason calendar lists the 3rd as a holiday
in scotland. i've no idea why. i think we should just remove that entry.

i'm reluctant to add an entry for hogmany as it's just what we (scots)
call new year's eve. i'm not sure there's justification for listing it
separately. i mean, the poles call it sylwester but we don;t add an
entry for that, or any other variant.

i guess you could propose a calendar.scotland addition. i'd be up for
that ;)

jmc

> >
> > Index: calendar.holiday
> > ===================================================================
> > RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.holiday,v
> > retrieving revision 1.32
> > diff -u -p -r1.32 calendar.holiday
> > --- calendar.holiday 12 Oct 2015 06:33:21 -0000 1.32
> > +++ calendar.holiday 4 Jan 2016 15:44:21 -0000
> > @@ -12,7 +12,7 @@
> >  01/01 Universal Fraternity Day in Mozambique
> >  01/02 Ancestry Day in Haiti
> >  01/02 St. Berchtold's Day in Switzerland
> > -01/03 New Year's Holiday in Scotland
> > +01/02 New Year's Holiday in Scotland and New Zealand
> >  01/03 Revolution Day in Upper Volta
> >  01/04 Independence Day in Burma
> >  01/04 Martyrs Day in Zaire
> > @@ -580,5 +580,6 @@
> >  12/29 His Majesty, the King's Birthday in Nepal
> >  12/30 Anniversary of the Democratic Republic of Madagascar in Madagascar
> >  12/31 Proclamation of the Republic in Congo
> > +12/31 Hogmanay - 3 day year transition festival in Scotland
> >  
> >  #endif /* !_calendar_holiday_ */
> >
> >
> > --
> > http://www.Scotland.org/features/hogmanay-top-facts/
> > http://www.RampantScotland.com/know/blknow12.htm
> > http://www.EdinburghsHogmanay.com/
> > http://www.EdinburghFestivalCity.com/festivals/edinburghs-hogmanay
> > http://en.wikipedia.org/wiki/Hogmanay

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Mark Carroll
In reply to this post by Jason McIntyre-2
On 04 Jan 2016, Jason McIntyre wrote:

> traditionally the 2nd was described as a bank holiday. now banks are
> open on this day. some businesses shut.

It still is a bank holiday, see
https://www.gov.uk/bank-holidays#scotland

Neither my Dundee employer nor my bank (Clydesdale) were open for it.

> let's just leave it that for people on this calendar, 31st is hogmany
> and the 1st is new year's day. days off are no longer inviolate/

The calendar does list others though, like St Andrew's Day.

-- Mark

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Raf Czlonka-2
In reply to this post by Jason McIntyre-2
On Mon, Jan 04, 2016 at 06:11:58PM GMT, Jason McIntyre wrote:

> On Mon, Jan 04, 2016 at 03:46:53PM +0000, Craig Skinner wrote:
> > Happy Hogmanay/New Year!
> >
> > Scotland & New Zealand have an additional New Year's celebrations
> > hangover recovery public holiday.
> >
> > In Scotland, Hogmanay is THE most significant winter festival, with
> > internationally popular street parties of 400,000 people dancing.
> >
> > (Xmas was banned in Scotland for over 400 years, until recently.)
> >
>
> i diasgree with this. it's true some of us in scotland get the 2nd off,
> but i'm not sure it's helpful to describe the 2nd as a new year's
> festival.
>
> really we have hogmany and new year's day. depending on your job, you'll
> get some combination of these off. i worked 31/1 and had the second off.
> lots of people have two weeks...
>
> traditionally the 2nd was described as a bank holiday. now banks are
> open on this day. some businesses shut.
>
> let's just leave it that for people on this calendar, 31st is hogmany
> and the 1st is new year's day. days off are no longer inviolate/
>
> jmc
>
> ps xmas banned in scotland till recently: how old are you exactly, craig ;)
>
> >
> > Index: calendar.holiday
> > ===================================================================
> > RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.holiday,v
> > retrieving revision 1.32
> > diff -u -p -r1.32 calendar.holiday
> > --- calendar.holiday 12 Oct 2015 06:33:21 -0000 1.32
> > +++ calendar.holiday 4 Jan 2016 15:44:21 -0000
> > @@ -12,7 +12,7 @@
> >  01/01 Universal Fraternity Day in Mozambique
> >  01/02 Ancestry Day in Haiti
> >  01/02 St. Berchtold's Day in Switzerland
> > -01/03 New Year's Holiday in Scotland
> > +01/02 New Year's Holiday in Scotland and New Zealand
> >  01/03 Revolution Day in Upper Volta
> >  01/04 Independence Day in Burma
> >  01/04 Martyrs Day in Zaire
> > @@ -580,5 +580,6 @@
> >  12/29 His Majesty, the King's Birthday in Nepal
> >  12/30 Anniversary of the Democratic Republic of Madagascar in Madagascar
> >  12/31 Proclamation of the Republic in Congo
> > +12/31 Hogmanay - 3 day year transition festival in Scotland
> >  
> >  #endif /* !_calendar_holiday_ */
> >
> >
> > --
> > http://www.Scotland.org/features/hogmanay-top-facts/
> > http://www.RampantScotland.com/know/blknow12.htm
> > http://www.EdinburghsHogmanay.com/
> > http://www.EdinburghFestivalCity.com/festivals/edinburghs-hogmanay
> > http://en.wikipedia.org/wiki/Hogmanay

Hi all,

However you call it, the fact is the date seems to be wrong (unless
we're talking about some other holiday) - 2nd January bank holiday is,
as the name suggests, on the 2nd of January[0]. Unless, of course, the
calendar should show the date when the holiday is celebrated, rather
than when it occurs - i.e. 2nd January bank holiday in Scotland is in
fact today (4th January), a substitute day.

Regards,

Raf

[0] https://www.gov.uk/bank-holidays#scotland

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Jason McIntyre-2
In reply to this post by Mark Carroll
On Mon, Jan 04, 2016 at 06:40:13PM +0000, Mark Carroll wrote:

> On 04 Jan 2016, Jason McIntyre wrote:
>
> > traditionally the 2nd was described as a bank holiday. now banks are
> > open on this day. some businesses shut.
>
> It still is a bank holiday, see
> https://www.gov.uk/bank-holidays#scotland
>
> Neither my Dundee employer nor my bank (Clydesdale) were open for it.
>

well i did say it depends who you work for.

> > let's just leave it that for people on this calendar, 31st is hogmany
> > and the 1st is new year's day. days off are no longer inviolate/
>
> The calendar does list others though, like St Andrew's Day.
>
> -- Mark
>

yes, fair point.

since the extra day is already listed (albeit on the wrong day) i guess
craig's diff is probably ok for the first hunk. i don;t really like it
though - it looks as if we celebrate new year's day on the second, not
the first. it is a holiday for some, but calendar is not so much
concerned about designated days off (please no one mail me exceptions).

i'd rather just zap it to be honest.

jmc

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Craig Skinner-3
In reply to this post by Jason McIntyre-2
On 2016-01-04 Mon 18:11 PM |, Jason McIntyre wrote:

> On Mon, Jan 04, 2016 at 03:46:53PM +0000, Craig Skinner wrote:
> > Happy Hogmanay/New Year!
> >
> > Scotland & New Zealand have an additional New Year's celebrations
> > hangover recovery public holiday.
> >
> > In Scotland, Hogmanay is THE most significant winter festival, with
> > internationally popular street parties of 400,000 people dancing.
> >
> > (Xmas was banned in Scotland for over 400 years, until recently.)
> >
>
> i diasgree with this. it's true some of us in scotland get the 2nd off,
> but i'm not sure it's helpful to describe the 2nd as a new year's
> festival.
>
> really we have hogmany and new year's day. depending on your job, you'll
> get some combination of these off. i worked 31/1 and had the second off.
> lots of people have two weeks...
>
> traditionally the 2nd was described as a bank holiday. now banks are
> open on this day. some businesses shut.
>

Many English businesses operating in Scotland are open on that day,
but many Scottish businesses are shut. It's a mixed bag.....

However, the Scottish Government lists it as an offical public holiday:
http://www.gov.scot/Topics/People/bank-holidays/
http://en.wikipedia.org/wiki/Bank_holidays_in_Scotland
"2nd January" is the decreed dour/hungover/can't be arsed label given.

Notice that the diff also includes New Zealand,
as mainly Scots established that country as part of the British Empire.
NZ too has the 2nd as a national holiday:
http://employment.govt.nz/er/holidaysandleave/publicholidays/publicholidaydates/current.asp
http://en.wikipedia.org/wiki/Public_holidays_in_New_Zealand
"Day after New Year's Day" is the silly long label given way down under.

For simpilicity I diffed them both together as:
> > +01/02 New Year's Holiday in Scotland and New Zealand
Maybe the wording could be better.... Feel free to improvise!

What about (lower case as not the offical name):
"Another new year's holiday in Scotland and New Zealand"

> jmc
>
> ps xmas banned in scotland till recently: how old are you exactly, craig ;)
>

I worked as a skilled mechanical fitter for a few years at the Edinburgh
Rolls Royce factory, many of the older tradesmen talked about not having
Xmas as a holiday until the 1960's. Likewise at other factories/breweries
that I worked in Edinburgh. The factories at Livingston I worked in were
mainly new semi-conductor, robotics & mobile phone factories, so most of
the men were younger, but spoke of their fathers working Xmas.

The Sun Microsystems factory in Linlithgow where I worked for 3.5 years
was different in that ALL statutory holidays were floating, with no
extra payment for working on them. It was like having an extra
fortnight's holiday to take whenever someone wanted. Superb!

In New Zealand, we would normally finish repairing the submarine hunter
killer warships towards the end of the year, then I would take them to
sea & full power test the turbines & control systems in mid December as
the last of the spring storms would toss the ship about & give the
engines a good work out. After the parties on ship, it would be a
fornight away from the Naval Base camping & yachting over New Year's.
Before back to the dockyard to take another frigate out of the sea &
strip it down for overhaul.

What a fucking fossil I am.... meh.
--
Craig Skinner | http://linkd.in/yGqkv7

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Craig Skinner-3
In reply to this post by Jason McIntyre-2
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_ */

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Craig Skinner-3
On 2016-01-06 Wed 23:31 PM |, Craig Skinner wrote:
>
> So I instead had a stab at a calendar.united-kingdom file.
>
> [blah]
>
> Swapping poles; the New Zealand addition, .....


Diff for man page & #include these 2 as well:

? calendars/calendar.new-zealand
? calendars/calendar.united-kingdom
Index: calendar.1
===================================================================
RCS file: /cvs/src/usr.bin/calendar/calendar.1,v
retrieving revision 1.40
diff -u -p -r1.40 calendar.1
--- calendar.1 7 Dec 2015 18:46:35 -0000 1.40
+++ calendar.1 7 Jan 2016 12:42:16 -0000
@@ -228,6 +228,8 @@ Jewish holidays (should be updated yearl
 so that roving holidays are set correctly for the current year).
 .It Pa calendar.music
 Musical events, births, and deaths (strongly oriented toward rock n' roll).
+.It Pa calendar.new-zealand
+New Zealand holidays and events
 .It Pa calendar.openbsd
 .Ox
 related events.
@@ -237,6 +239,8 @@ Pagan holidays, celebrations and festiva
 Russian calendar.
 .It Pa calendar.space
 Cosmic history.
+.It Pa calendar.united-kingdom
+U.K. holidays, celebrations and festivals.
 .It Pa calendar.ushistory
 U.S. history.
 .It Pa calendar.usholiday
Index: calendars/calendar.all
===================================================================
RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.all,v
retrieving revision 1.5
diff -u -p -r1.5 calendar.all
--- calendars/calendar.all 15 Mar 2013 08:37:10 -0000 1.5
+++ calendars/calendar.all 7 Jan 2016 12:42:16 -0000
@@ -17,5 +17,7 @@
 #include <calendar.ushistory>
 #include <calendar.space>
 #include <calendar.canada>
+#include <calendar.united-kingdom>
+#include <calendar.new-zealand>
 
 #endif /* !_calendar_all_ */
Index: calendars/calendar.holiday
===================================================================
RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.holiday,v
retrieving revision 1.33
diff -u -p -r1.33 calendar.holiday
--- calendars/calendar.holiday 5 Jan 2016 08:28:02 -0000 1.33
+++ calendars/calendar.holiday 7 Jan 2016 12:42:17 -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

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Craig Skinner-3
In reply to this post by Craig Skinner-3
Hi all,

On 2016-01-06 Wed 23:31 PM |, Craig Skinner wrote:
>
> So I instead had a stab at a calendar.united-kingdom file.
>

Following on from a bit of discussion, below is an attempt at a UK
calendar file, with major items already in calendar.holiday strippped
out. e.g. New Year's Day, although it is an offical bank/public holiday.

There is an incorrect entry in calendar.holiday for an August bank
holiday. The name was wrong & dates wrong for 2 countries. 2 other
countries of the UK were missing it on a different date, and as it isn't
of any international significance, I've corrected it in the new UK file.

Refs (watch out for multiple mistakes on Wikipedia):
http://www.gov.scot/Topics/People/bank-holidays/
http://www.gov.uk/bank-holidays
http://en.wikipedia.org/wiki/Public_holidays_in_the_United_Kingdom
http://en.wikipedia.org/wiki/Bank_holiday

To get us going, I've ignored the many regional Scottish holidays. I
guess England has a heap of them too, but that's for another time.


Also for simplicity, I'll revisit the New Zealand addition later on.


This isn't _perfect_, but it could be a resonable starting point:


Index: calendar.1
===================================================================
RCS file: /cvs/src/usr.bin/calendar/calendar.1,v
retrieving revision 1.40
diff -u -p -r1.40 calendar.1
--- calendar.1 7 Dec 2015 18:46:35 -0000 1.40
+++ calendar.1 11 Jan 2016 18:22:41 -0000
@@ -237,6 +237,8 @@ Pagan holidays, celebrations and festiva
 Russian calendar.
 .It Pa calendar.space
 Cosmic history.
+.It Pa calendar.united-kingdom
+U.K. holidays, celebrations and festivals.
 .It Pa calendar.ushistory
 U.S. history.
 .It Pa calendar.usholiday
Index: calendars/calendar.holiday
===================================================================
RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.holiday,v
retrieving revision 1.33
diff -u -p -r1.33 calendar.holiday
--- calendars/calendar.holiday 5 Jan 2016 08:28:02 -0000 1.33
+++ calendars/calendar.holiday 11 Jan 2016 18:22:41 -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
@@ -434,7 +433,7 @@
 11/30 Independence Day in Barbados, People's Democratic Yemen Republic
 11/30 National Day in Benin
 11/30 National Heroes Day in Philippines
-11/30 St. Andrew's Day
+11/30 Saint Andrew's Day - a bank holiday in Scotland
 12/01 Independence Day in Central African Republic
 12/01 World AIDS Day
 12/01 National Day in Romania
--- /dev/null Mon Jan 11 18:23:51 2016
+++ calendars/calendar.united-kingdom Mon Jan 11 18:19:59 2016
@@ -0,0 +1,38 @@
+/*
+ * United Kingdom holiday
+ *
+ * $OpenBSD$
+ */
+
+#ifndef _calendar_united-kingdom_
+#define _calendar_united-kingdom_
+
+01/02 2nd January bank holiday in Scotland - another new year's holiday
+01/25 Burns' Night in Scotland
+03/01 Saint David's Day in Wales
+03/17 Saint Patrick's Day - a 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 Early 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 Battle of the Boyne/Orangemen's Day/The Twelfth - a bank holiday in Northern Ireland
+08/MonFirst Summer Bank Holiday in Scotland
+08/MonLast Summer Bank Holiday - except Scotland
+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
+12/21* Winter Solstice
+12/31 Hogmanay - 3 day year transition festival in Scotland
+
+#endif /* !_calendar_united-kingdom_ */

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Raf Czlonka-2
On Mon, Jan 11, 2016 at 07:35:50PM GMT, Craig Skinner wrote:

> Hi all,
>
> On 2016-01-06 Wed 23:31 PM |, Craig Skinner wrote:
> >
> > So I instead had a stab at a calendar.united-kingdom file.
> >
>
> Following on from a bit of discussion, below is an attempt at a UK
> calendar file, with major items already in calendar.holiday strippped
> out. e.g. New Year's Day, although it is an offical bank/public holiday.
>
> There is an incorrect entry in calendar.holiday for an August bank
> holiday. The name was wrong & dates wrong for 2 countries. 2 other
> countries of the UK were missing it on a different date, and as it isn't
> of any international significance, I've corrected it in the new UK file.
>
> Refs (watch out for multiple mistakes on Wikipedia):
> http://www.gov.scot/Topics/People/bank-holidays/
> http://www.gov.uk/bank-holidays
> http://en.wikipedia.org/wiki/Public_holidays_in_the_United_Kingdom
> http://en.wikipedia.org/wiki/Bank_holiday
>
> To get us going, I've ignored the many regional Scottish holidays. I
> guess England has a heap of them too, but that's for another time.
>
>
> Also for simplicity, I'll revisit the New Zealand addition later on.
>
>
> This isn't _perfect_, but it could be a resonable starting point:
>
>
> Index: calendar.1
> ===================================================================
> RCS file: /cvs/src/usr.bin/calendar/calendar.1,v
> retrieving revision 1.40
> diff -u -p -r1.40 calendar.1
> --- calendar.1 7 Dec 2015 18:46:35 -0000 1.40
> +++ calendar.1 11 Jan 2016 18:22:41 -0000
> @@ -237,6 +237,8 @@ Pagan holidays, celebrations and festiva
>  Russian calendar.
>  .It Pa calendar.space
>  Cosmic history.
> +.It Pa calendar.united-kingdom
> +U.K. holidays, celebrations and festivals.
>  .It Pa calendar.ushistory
>  U.S. history.
>  .It Pa calendar.usholiday
> Index: calendars/calendar.holiday
> ===================================================================
> RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.holiday,v
> retrieving revision 1.33
> diff -u -p -r1.33 calendar.holiday
> --- calendars/calendar.holiday 5 Jan 2016 08:28:02 -0000 1.33
> +++ calendars/calendar.holiday 11 Jan 2016 18:22:41 -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
> @@ -434,7 +433,7 @@
>  11/30 Independence Day in Barbados, People's Democratic Yemen Republic
>  11/30 National Day in Benin
>  11/30 National Heroes Day in Philippines
> -11/30 St. Andrew's Day
> +11/30 Saint Andrew's Day - a bank holiday in Scotland
>  12/01 Independence Day in Central African Republic
>  12/01 World AIDS Day
>  12/01 National Day in Romania
> --- /dev/null Mon Jan 11 18:23:51 2016
> +++ calendars/calendar.united-kingdom Mon Jan 11 18:19:59 2016
> @@ -0,0 +1,38 @@
> +/*
> + * United Kingdom holiday
> + *
> + * $OpenBSD$
> + */
> +
> +#ifndef _calendar_united-kingdom_
> +#define _calendar_united-kingdom_
> +
> +01/02 2nd January bank holiday in Scotland - another new year's holiday
> +01/25 Burns' Night in Scotland
> +03/01 Saint David's Day in Wales
> +03/17 Saint Patrick's Day - a 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

This I'm not entirely sure of but both Google and Wikipedia use plural
possessive - "April Fools' 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 Early 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 Battle of the Boyne/Orangemen's Day/The Twelfth - a bank holiday in Northern Ireland
> +08/MonFirst Summer Bank Holiday in Scotland
> +08/MonLast Summer Bank Holiday - except Scotland
> +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

If Google search results are anything to go by, then "Guy Fawkes Night"
might be a bit better as it returns slightly more results. Regardless
how you call it, however, it's neither possessive, nor plural.

Regards,

Raf

> +11/11 Remembrance Day
> +11/SunSecond Remembrance Sunday
> +12/21* Winter Solstice
> +12/31 Hogmanay - 3 day year transition festival in Scotland
> +
> +#endif /* !_calendar_united-kingdom_ */

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Jason McIntyre-2
On Mon, Jan 11, 2016 at 08:33:56PM +0000, Raf Czlonka wrote:
> > +04/01 April Fool's Day
>
> This I'm not entirely sure of but both Google and Wikipedia use plural
> possessive - "April Fools' Day".
>

oxford style manual notes "Fool's" (singular) as being of US in origin,
and "Fools'" as UK. i would probably use "Fools'" myself.

> > +11/05 Guy Fawkes' Day
>
> If Google search results are anything to go by, then "Guy Fawkes Night"
> might be a bit better as it returns slightly more results. Regardless
> how you call it, however, it's neither possessive, nor plural.
>

it is possessive. but it may well be more usually written without the
apostrophe. apostrophes often get applied illogically. i can;t say in
this case, since i can;t find anything definitive. personally i would
use an apostrophe. but everyone i know calls it bonfire night.

jmc

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Stuart Henderson
On 2016-01-11, Jason McIntyre <[hidden email]> wrote:

> On Mon, Jan 11, 2016 at 08:33:56PM +0000, Raf Czlonka wrote:
>> > +04/01 April Fool's Day
>>
>> This I'm not entirely sure of but both Google and Wikipedia use plural
>> possessive - "April Fools' Day".
>>
>
> oxford style manual notes "Fool's" (singular) as being of US in origin,
> and "Fools'" as UK. i would probably use "Fools'" myself.
>
>> > +11/05 Guy Fawkes' Day
>>
>> If Google search results are anything to go by, then "Guy Fawkes Night"
>> might be a bit better as it returns slightly more results. Regardless
>> how you call it, however, it's neither possessive, nor plural.
>>
>
> it is possessive. but it may well be more usually written without the
> apostrophe. apostrophes often get applied illogically. i can;t say in
> this case, since i can;t find anything definitive. personally i would
> use an apostrophe. but everyone i know calls it bonfire night.

+1 for bonfire night. It looks like there's a different bonfire night
in N.Ireland though.

April Fools, solstices and equinoxes aren't just UK.

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Craig Skinner-3
In reply to this post by Raf Czlonka-2
Hi Raf,

On 2016-01-11 Mon 20:33 PM |, Raf Czlonka wrote:
> On Mon, Jan 11, 2016 at 07:35:50PM GMT, Craig Skinner wrote:
> >
> > This isn't _perfect_, but it could be a resonable starting point:
> >
> > +04/01 April Fool's Day
>
> This I'm not entirely sure of but both Google and Wikipedia use plural
> possessive - "April Fools' Day".
>

The Canadian file was used as a starting point, & the U.S. file has the
same entry:

$ fgrep -iR Fool *
calendar.canada:04/01   April Fool's Day
calendar.united-kingdom:04/01   April Fool's Day
calendar.usholiday:04/01        April Fool's Day


> > +11/05 Guy Fawkes' Day
>
> If Google search results are anything to go by, then "Guy Fawkes Night"
> might be a bit better as it returns slightly more results. Regardless
> how you call it, however, it's neither possessive, nor plural.
>

Night it is, thanks!

The .history file has it as:
Guy Fawkes' Plot, 1605

"Fawkes" was his surname, with the 's' included.

http://en.wikipedia.org/wiki/Guy_Fawkes_Night

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Craig Skinner-3
In reply to this post by Stuart Henderson
Hi Stuart,

On 2016-01-12 Tue 18:14 PM |, Stuart Henderson wrote:
> >
> >> > +11/05 Guy Fawkes' Day
> >>

>
> +1 for bonfire night. It looks like there's a different bonfire night
> in N.Ireland though.
>

Ahhh yes, you're right.

Keeping it the traditional name of Guy Fawkes' Night would solve the
clash there. It is usually also called that in many of the 72 British
Commonwealth countries, such as New Zealand.

> April Fools, solstices and equinoxes aren't just UK.
>

There are lots of internationally popular events to consolidate into
.holiday, which involve changing a pile of files:

$ fgrep -iR Fool *
calendar.canada:04/01   April Fool's Day
calendar.united-kingdom:04/01   April Fool's Day
calendar.usholiday:04/01        April Fool's Day

To my mind, that is fairly internationally recognised, so could be doing
with shifting from .canada & .usholiday into .holiday.

This also is pretty global:
$ fgrep -iR Valentine *
calendar.canada:02/14   St. Valentine's Day
calendar.usholiday:02/14        St. Valentine's Day


The solstices and equinoxes are already in a variety of files.
To my thinking, they could be doing with consolidation into just 1 file,
probably .pagan:

$ fgrep -iR solst *
calendar.canada:06/21*  Summer Solstice
calendar.canada:12/21*  Winter Solstice
calendar.pagan:06/20    2nd Quarter Day - Summer Solstice
calendar.pagan:12/20    4th Quarter Day - Winter Solstice
calendar.united-kingdom:06/21*  Summer Solstice
calendar.united-kingdom:12/21*  Winter Solstice
calendar.usholiday:06/21*       Summer Solstice
calendar.usholiday:12/21*       Winter Solstice
$ fgrep -iR equino *
calendar.canada:03/20*  Vernal Equinox
calendar.canada:09/22*  Autumnal Equinox
calendar.pagan:03/19    1st Quarter Day - Spring (Vernal) Equinox
calendar.pagan:09/21    3rd Quarter Day - Fall (Autumnal) Equinox
calendar.united-kingdom:03/20*  Vernal Equinox
calendar.united-kingdom:09/22*  Autumnal Equinox
calendar.usholiday:03/20*       Vernal Equinox
calendar.usholiday:09/22*       Autumnal Equinox

What also jumps out at me is those seasonal qualifiers are only valid
for half the planet, and are swapped about for the hemispheres. I just
duplicated & left them as I don't know if there is any pagan
significance to the naming of them. In my New Zealand file, I simply
swapped the seasons about.

As it was getting complicated (there's other items too....),
I made an imperfect U.K. file, with mininal interruption to existing files.

What's the order of business here?
*) Get a semi shipshape U.K. file imported soon?
*) Consolidate as much as possible first?

I'm OK with slowly chugging through some sort of tidy up of common
items, a diff for a Day. Which could take time & be divisive...

Reply | Threaded
Open this post in threaded view
|

Re: [DIFF] New Year's calendar

Raf Czlonka-2
In reply to this post by Craig Skinner-3
On Tue, Jan 12, 2016 at 09:41:47PM GMT, Craig Skinner wrote:
> Hi Raf,

Hi Craig,

> On 2016-01-11 Mon 20:33 PM |, Raf Czlonka wrote:
> > On Mon, Jan 11, 2016 at 07:35:50PM GMT, Craig Skinner wrote:
> > >
> > > This isn't _perfect_, but it could be a resonable starting point:
> > >
> > > +04/01 April Fool's Day
> >
> > This I'm not entirely sure of but both Google and Wikipedia use plural
> > possessive - "April Fools' Day".
> >
>
> The Canadian file was used as a starting point, & the U.S. file has the
> same entry:
>
> $ fgrep -iR Fool *
> calendar.canada:04/01   April Fool's Day
> calendar.united-kingdom:04/01   April Fool's Day
> calendar.usholiday:04/01        April Fool's Day

As Jason already mentioned, singular possessive "Fool's" seems to be
chiefly North American, whereas in UK plural possessive "Fools'" appears
to be more common.

> > > +11/05 Guy Fawkes' Day
> >
> > If Google search results are anything to go by, then "Guy Fawkes Night"
> > might be a bit better as it returns slightly more results. Regardless
> > how you call it, however, it's neither possessive, nor plural.
> >
>
> Night it is, thanks!
>
> The .history file has it as:
> Guy Fawkes' Plot, 1605
>
> "Fawkes" was his surname, with the 's' included.
>
> http://en.wikipedia.org/wiki/Guy_Fawkes_Night
>

Sure, I'm aware of that. What I was referring to was that usually the
apostrophe is omitted and it is written "Guy Fawkes Day/Night", which I
said that it's not possessive and Jason corrected me, as it obviously
is - it's simply doesn't appear as such when written that way. The way
you wrote it (Fawkes') is usual for plural possessive and at first it
would seem that, if using an apostrophe, Fawkes's would have been more
appropriate. However, after some reeducation, I can see that it is not
the case, as the "rules" are all over the place and they vary from
country to country, or region to region. I'll shut up now :^)

BTW, also +1 for Bonfire Night as it is indeed referred to as such more
often than the former.

Regards,

Raf