On Wed, Jan 27, 2016 at 11:06:41PM +0000, Craig Skinner wrote: > Hi folks, > > NOOP;- relocate USA state/national holidays from calendar.holiday > into existing sparse calendar.usholiday file. > > As they're now in the USA holiday file, strip state names from holiday > names where the state is named in the day itself. > > e.g: 'Oklahoma Day in Oklahoma' becomes 'Oklahoma Day'. > e.g: 'Youth Day in Oklahoma' remains unchanged. >
hi craig. i have to say i am less keen on this. i think calendar.holiday is pretty much a us-centric file anyway, for fairly obvious reasons. i'm not sure that splitting this file makes sense. we'll end up with a holiday file with few entries, and which belong nowhere. having said that, "oklahoma day in oklahoma" is kind of nuts. we could probably still change entries like that (but not in a separate file). jmc > > Index: calendar.holiday > =================================================================== > RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.holiday,v > retrieving revision 1.35 > diff -u -p -r1.35 calendar.holiday > --- calendar.holiday 20 Jan 2016 19:12:28 -0000 1.35 > +++ calendar.holiday 27 Jan 2016 22:52:23 -0000 > @@ -27,16 +27,12 @@ > 01/15 Arbor Day in Jordan > 01/16 Martyrs Day in Benin > 01/18 Revolution Day in Tunisia > -01/19 Confederate Heroes Day in Texas > 01/19 Ethopian Epiphany in Ethiopia > 01/19 Nameday of Archbishop Makarios in Cyprus > 01/20 Army Day in Mali > 01/20 National Heroes Day in Guinea-Bissau > -01/MonThird Robert E. Lee's Birthday in Alabama & Mississippi (3rd Monday) > -01/MonThird Lee-Jackson Day in Virginia (3rd Monday) > 01/21 Our Lady of Altagracia in Dominican Republic > 01/23 Feast of St. Ildefonsus > -01/23 National Handwriting Day > 01/24 Economic Liberation Day in Togo > 01/26 Republic Day in India > 01/30 Australia Day in Australia > @@ -60,11 +56,9 @@ > 03/01 Samil Independence Movement Day in South Korea > 03/01 St. David's Day, Cardiff > 03/02 Peasants Day in Burma > -03/02 Texas Independence day > 03/02 Victory of Adowa in Ethiopia > 03/03 Girl's Day in Japan > 03/03 Throne Day in Morocco > -03/04 Vermont Admission Day (admitted as 14th state in 1791) > 03/05 Independence Day in Equatorial Guinea > 03/06 Lantern Day, Bejing > 03/07* Purim - Feast of Lots > @@ -76,39 +70,31 @@ > 03/09 Decoration Day in Liberia > 03/09 Falgun Purnima Day in Nepal > 03/10 Labor Day in South Korea > -03/11 Johnny Appleseed Day; anniversary of the death of John Chapman > 03/12 Commonwealth Day in Swaziland > 03/12 Independence Day in Mauritius > 03/12 Moshoeshoe's Birthday in Lesotho > 03/12 Renovation Day in Gabon > 03/13 National Day in Grenada > 03/15 Day of the 1848 revolution in Hungary > -03/16 Black Press Day; first Black newspaper founded in 1827 > -03/17 Evacuation Day in Suffolk County, Massachusetts > 03/17 St. Patrick's Day > 03/19 St. Joseph's Day in Colombia, Costa Rica, Holy See, > Liechtenstein, > Bavaria, San Marino, Spain, Venezuela > 03/19 Tree Planting Day in Lestho > 03/20 Independence Day in Tunsia > -03/20 Youth Day in Oklahoma > 03/21 Afghan New Year in Afghanistan > 03/21 Juarez' Birthday in Mexico > 03/22 Abolition Day in Puerto Rico > 03/23 Pakistan Day in Pakistan > 03/25 Greek Independence Day in Cyprus > 03/25 Lady Day (a.k.a. the Feast of the Annunciation) > -03/25 Maryland Day in Maryland > 03/25 National Holiday in Greece > -03/MonLast Seward's Day in Alaska (last Monday) > 03/26 Independence Day in Bangladesh > -03/26 Prince Jonah Kuhio Kalanianaole Day in Hawaii > 03/27 Armed Forces Day in Burma > 03/29 Death of President Barthelemy Boganda in Central African > Republic > 03/29 Memorial Day in Madagascar > 03/31 National Day in Malta > 04/01 Youth Day in Benin > 04/02 Malvinas Day in Argentina > -04/02 Pascua Florida Day in Florida > 04/04 Ching Ming Festival in Hong Kong > 04/04 Liberation Day in Hungary > 04/04 National Day in Senegal > @@ -123,7 +109,6 @@ > 04/13 Songkran Day in Thailand > 04/14 Day of the Americas in Honduras > 04/15 Bengali New Year in Bangladesh > -04/MonThird Patriot's Day in Maine & Massachusetts (3rd Monday) > 04/16 De Diego's Birthday (celebrated in Puerto Rico) > 04/16 Holy Week (5 days) in Venezuela > 04/16 Tourist Week (5 days) in Uruguay > @@ -131,39 +116,28 @@ > 04/18 Independence Day in Chile, Zimbabwe > 04/19 Declaration of Independence in Venezuela > 04/19 Republic Day in Sierra Leone > -04/21 San Jacinto Day in Texas > -04/22 Arbor Day in Nebraska & Delaware > -04/22 Oklahoma Day in Oklahoma > 04/24 Victory Day in Togo > 04/24* Pesach - First Day of Passover - Festival of Freedom > 04/25* ANZAC Day in Australia, New Zealand, and various other > influenced places > 04/25 Liberation Day in Italy > 04/25 National Flag Day in Swaziland > -04/26 Confederate Memorial Day in Florida & Georgia > 04/26 Union Day in Tanzania > 04/27 Day of Uprising Against Occupation in Slovenia > 04/27 Independence Day in Togo > -04/MonLast Arbor Day in Wyoming (last Monday) > -04/MonLast Confederate Memorial Day in Alabama & Mississippi (last Monday) > 04/30 The Workers Day in Uruguay > 05/01 Labor Day in many places > -05/01 Law Day (decl. by Eisenhower) > 05/01 May Day in many places > 05/02 Constitution Day in Japan > 05/03 Constitution Day in Poland > -05/04 Rhode Island Independence Day > 05/05 Children's Day in Japan, South Korea > 05/05 Coronation Day in Thailand > 05/05 Liberation Day in the Netherlands > 05/06 Bataan Day in Philippines > 05/06* Bank Holiday in UK > 05/07 May Day in United Kingdom > -05/08 Truman Day in Missouri > 05/09 Liberation Day in Czechoslovakia > 05/09 Victory Day in U.S.S.R. > -05/10 Confederate Memorial Day in South Carolina > 05/10 Mothers Day in Guatemala > -05/11 Minnesota Day in Minnesota > 05/14 Buddhist Holiday (Waisak 2528) in Indonesia > 05/14 Independence Day (2 days) in Paraguay > 05/14 Unification Day in Liberia > @@ -175,8 +149,6 @@ > 05/18 Flag Day in Haiti > 05/18 Prayer Day in Denmark > 05/19 Youth and Sports Day in Turkey > -05/MonThird Memorial Day in Michigan (3rd Monday) > -05/20 Mecklenburg Independence Day in North Carolina > 05/20 National Day in Cameroon > 05/Mon-2 Victoria Day in Canada > 05/21 Independence Day in Montenegro > @@ -198,7 +170,6 @@ > 06/01 Independence Days (3 days) in Western Samoa > 06/01 Madaraka Day in Kenya > 06/01 Victory Day in Tunisia > -06/03 Confederate Memorial Day in Kentucky & Louisiana > 06/03 Labor Day in Bahamas > 06/03* Bank Holiday in Rep. of Ireland > 06/04 Emancipation Day in Tonga > @@ -206,20 +177,14 @@ > 06/05 Liberation Day in Seychelles > 06/06 Memorial Day in South Korea > 06/06 National Day in Sweden > -06/09 Senior Citizen's Day in Oklahoma > 06/10 Camoes Day in Portugal > -06/11 King Kamehameha I Day in Hawaii > 06/12 Independence Day in Philippines > -06/14 Flag Day > -06/17 Bunker Hill Day in Suffolk County, Massachusetts > 06/17 Independence Day in Iceland > 06/17 National Day in Federal Republic of Germany > 06/18 Evacuation Day in Egypt > -06/19 Emancipation Day in Texas > 06/19 Labor Day in Trinidad, Tobago > 06/19 Revolution Day in Algeria > 06/20 Flag Day in Argentina > -06/20 West Virginia Day in West Virginia > 06/22 National Sovereignty Day in Haiti > 06/23 National Holiday in Luxembourg > 06/24 Fisherman's Day in Madagascar, Mozambique, Somalia > @@ -264,7 +229,6 @@ > 07/21 National Holiday in Belgium > 07/23 Egyptian National Day in Syrian Arab Republic > 07/23 Remembrance Day in Papua, New Guinea > -07/24 Pioneer Day in Utah > 07/24 Simon Bolivar's Day in Ecuador, Venezuela > 07/25 Constitution Day in Puerto Rico > 07/25 National Rebellion Day (3 days) in Cuba > @@ -272,7 +236,6 @@ > 07/26 Independence Day in Liberia > 07/26 National Day in Maldives > 07/28 Independence Days (2 days) in Peru > -07/29 Rain Day in Waynesburg, PA > 07/31 Revolution Day in Congo > 08/01 Discovery Day in Trinidad, Tobogo > 08/01 Emancipation Day in Granada > @@ -297,8 +260,6 @@ > 08/15 Independence Day in India > 08/15 Liberation Day in South Korea > 08/15 National Day in Congo > -08/FriThird Admission Day in Hawaii, 1959 (3rd Friday) > -08/16 Bennington Battle Day in Vermont > 08/16 Independence Days (3 days) in Gabon > 08/16 Restoration Day in Dominican Republic > 08/17 Independence Day in Indonesia > @@ -307,11 +268,9 @@ > 08/24 National Flag Day in Liberia > 08/25 Constitution Day in Paraguay > 08/25 Independence Day in Uruguay > -08/26 Susan B. Anthony Day in Massachusetts > 08/26* Bank Holiday in England and Wales > 08/27 Liberation Day in Hong Kong > 08/28 Heroes Day in Philippines > -08/30 Huey P. Long Day in Louisiana > 08/30 Victory Day in Turkey > 08/31 Independence Day in Trinidad, Tobago > 08/31 National Day in Malaysia > @@ -322,16 +281,12 @@ > 09/06 Defense of Pakistan Day in Pakistan > 09/06 Settlers Day in South Africa > 09/07 Independence Day in Brazil > -09/09 Admission Day in California > 09/09 National Day in North Korea > 09/10 Korean Thanksgiving Day (Chusuk) in South Korea > 09/10 National Day in Belize > 09/11 National Holiday in Chile > -09/12 Defender's Day in Maryland > 09/12 Revolution Day in Ethiopia > -09/13 Barry Day commemorates the death of Commodore John Barry > 09/15 Respect for the Aged Day in Japan > -09/16 Cherokee Strip Day in Oklahoma > 09/16 Independence Day in Mexico, Papua, New Guinea > 09/17 National Heroes Day in Angola > 09/18 Independence Day in Chile, Zimbabwe > @@ -369,7 +324,6 @@ > 10/MonSecond Health-Sports Day in Japan > 10/MonSecond Thanksgiving Day in Canada > 10/10 National Day in Taiwan > -10/10 Oklahoma Historical Day in Oklahoma > 10/11 Day of the Revolution in Panama > 10/11 Druger Day in South Africa > 10/12 Day of the Race in Argentina > @@ -381,7 +335,6 @@ > 10/14 National Day in Yemen Arab Republic > 10/14 Young People's Day in Zaire > 10/15 Evacuation Day in Tunisia > -10/16 National Boss Day > 10/17 Heroes Day in Jamaica > 10/17 Mother's Day in Malawi > 10/20 Kenyatta Day in Kenya > @@ -405,7 +358,6 @@ > 11/03 Culture Day in Japan > 11/03 Thanksgiving Day in Liberia > 11/04 Flag Day in Panama > -11/04 Will Rogers Day > 11/06 Green March Day in Morocco > 11/07 National Revolution Day > 11/07 October Revolution Day in Hungary > @@ -438,13 +390,11 @@ > 12/02 National Holiday in United Arab Emirates > 12/03 National Holiday in Laos > 12/06 Independence Day in Finland > -12/07 Delaware Day in Delaware > 12/07 Independence Day in Ivory Coast, Panama > 12/08 Mother's Day in Panama > 12/09 Independence Day in Tanzania > 12/10 Human Rights Day > 12/10 Thai Constitution Day in Thailand > -12/10 Wyoming Day in Wyoming > 12/11 Independence Day in Upper Volta > 12/12 Independence Day in Kenya > 12/13 Republic Day in Malta > @@ -484,8 +434,6 @@ > 05/25 Revolution in the Sudan in Libyan Arab Republic > 05/27 Afghanistan attains sovereignty, 1921 > 06/02 Corpus Christi in Paraguay > -06/MonFirst Jefferson Davis's Birthday in Alabama & Mississippi (1st Monday) > -06/MonFirst Jefferson Davis's Birthday in Florida, Georgia, & S. Carolina > 06/06 His Majesty, Yang Di-Pertuan Agong's Birthday in Malaysia > 06/11 Queen's Birthday > 06/12 Peace with Bolivia in Paraguay > @@ -554,7 +502,6 @@ > 11/14 King Hussein's Birthday in Jordan > 11/15 Proclamation of the Republic in Brazil > 11/15 Thatlouang Festival in Laos > -11/16 Oklahoma Heritage Week in Oklahoma > 11/17 Corrective Movement in Syrian Arab Republic > 11/18 Battle of Viertieres in Haiti > 11/19 Anniversary of the 1968 Coup by the Army in Mali > Index: calendar.usholiday > =================================================================== > RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.usholiday,v > retrieving revision 1.9 > diff -u -p -r1.9 calendar.usholiday > --- calendar.usholiday 19 Jan 2015 18:07:47 -0000 1.9 > +++ calendar.usholiday 27 Jan 2016 22:52:23 -0000 > @@ -8,31 +8,95 @@ > #define _calendar_usholiday_ > > 01/01 New Year's Day > +01/19 Confederate Heroes Day in Texas > +01/MonThird Robert E. Lee's Birthday in Alabama & Mississippi (3rd Monday) > +01/MonThird Lee-Jackson Day in Virginia (3rd Monday) > 01/MonThird Martin Luther King Jr. Day (3rd Monday of January) > +01/23 National Handwriting Day > + > 02/02 Groundhog Day > 02/14 St. Valentine's Day > 02/MonThird President's Day (3rd Monday of February) > + > +03/02 Texas Independence Day > +03/04 Vermont Admission Day (admitted as 14th state in 1791) > 03/05 Mother-in-Law Day > 03/SunSecond Daylight Saving Time begins; clocks move forward (2nd Sunday of > March) > +03/11 Johnny Appleseed Day; anniversary of the death of John Chapman > +03/16 Black Press Day; first Black newspaper founded in 1827 > +03/17 Evacuation Day in Suffolk County, Massachusetts > 03/20* Vernal Equinox > +03/20 Youth Day in Oklahoma > +03/25 Maryland Day > +03/MonLast Seward's Day in Alaska (last Monday) > +03/26 Prince Jonah Kuhio Kalanianaole Day in Hawaii > + > 04/01 April Fool's Day > +04/02 Pascua Florida Day > 04/15 Income Tax Day > +04/21 San Jacinto Day in Texas > +04/22 Arbor Day in Nebraska & Delaware > +04/22 Oklahoma Day > +04/26 Confederate Memorial Day in Florida & Georgia > +04/MonThird Patriot's Day in Maine & Massachusetts (3rd Monday) > +04/MonLast Arbor Day in Wyoming (last Monday) > +04/MonLast Confederate Memorial Day in Alabama & Mississippi (last Monday) > 04/28* Arbor Day (varies from state to state) > + > +05/01 Law Day (decl. by Eisenhower) > +05/04 Rhode Island Independence Day > 05/SunSecond Mother's Day (2nd Sunday of May) > +05/08 Truman Day in Missouri > +05/10 Confederate Memorial Day in South Carolina > +05/11 Minnesota Day > +05/MonThird Memorial Day in Michigan (3rd Monday) > 05/SatThird Armed Forces Day (3rd Saturday of May) > 05/MonLast Memorial Day (Last Monday of May) > +05/20 Mecklenburg Independence Day in North Carolina > + > +06/MonFirst Jefferson Davis's Birthday in Alabama & Mississippi (1st Monday) > +06/MonFirst Jefferson Davis's Birthday in Florida, Georgia, & S. Carolina > +06/03 Confederate Memorial Day in Kentucky & Louisiana > +06/09 Senior Citizen's Day in Oklahoma > +06/11 King Kamehameha I Day in Hawaii > +06/14 Flag Day > +06/17 Bunker Hill Day in Suffolk County, Massachusetts > +06/19 Emancipation Day in Texas > +06/20 West Virginia Day > 06/SunThird Father's Day (3rd Sunday of June) > 06/21* Summer Solstice > + > 07/04 Independence Day > +07/24 Pioneer Day in Utah > +07/29 Rain Day in Waynesburg, Pennsylvania > + > +08/16 Bennington Battle Day in Vermont > +08/26 Susan B. Anthony Day in Massachusetts > +08/FriThird Admission Day in Hawaii, 1959 (3rd Friday) > +08/30 Huey P. Long Day in Louisiana > + > 09/MonFirst Labor Day (1st Monday of September) > 09/SunSecond Grandparent's Day (2nd Sunday of September; varies from state > to state) > +09/09 Admission Day in California > +09/12 Defender's Day in Maryland > +09/13 Barry Day; commemorates the death of Commodore John Barry > +09/16 Cherokee Strip Day in Oklahoma > 09/22* Autumnal Equinox > + > +10/10 Oklahoma Historical Day > +10/16 National Boss Day > 10/MonSecond Columbus Day (2nd Monday of October) > 10/31 All Hallows' Eve (Halloween) > + > +11/04 Will Rogers Day > 11/TueFirst Election Day (1st Tuesday after 1st Monday for even years) > 11/SunFirst Daylight Saving Time ends; clocks move back (1st Sunday in > November) > 11/11 Veterans' Day > +11/16 Oklahoma Heritage Week > 11/ThuFourth Thanksgiving Day (4th Thursday in November) > + > +12/07 Delaware Day > +12/10 Wyoming Day > 12/21* Winter Solstice > 12/24 Christmas Eve > 12/25 Christmas >
