From 04ff31099be66c2dacaad0e6c86fd7bf2d823a9f Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Sun, 29 Oct 2000 11:55:37 +0100
Subject: [PATCH] additions and fixes and comments

Rev: lib/modules/Calendar.pmod/events/regional:1.9
---
 lib/modules/Calendar.pmod/events/regional | 346 ++++++++++++++++------
 1 file changed, 261 insertions(+), 85 deletions(-)

diff --git a/lib/modules/Calendar.pmod/events/regional b/lib/modules/Calendar.pmod/events/regional
index ae3ed75655..8844d244f8 100644
--- a/lib/modules/Calendar.pmod/events/regional
+++ b/lib/modules/Calendar.pmod/events/regional
@@ -1,6 +1,6 @@
 ### Calendar module
 ### Event definition file
-### $Id: regional,v 1.8 2000/10/26 15:23:14 mirar Exp $
+### $Id: regional,v 1.9 2000/10/29 10:55:37 mirar Exp $
 
 ### =====================================================================
 ###
@@ -276,6 +276,13 @@ Region "anglican church"
 Region "mormonism"
   Event "mormonism/founding of the mormon church" - "Founding of the Mormon Church" Fixed Apr  6
 
+# islam
+Region "islamic"
+  Event "al fitr"  h "Id al Fitr (End of Ramadan)"          Islamic_Fixed Schaww�l 1
+  Event "al adha"  h "Eid al Adha (Feast of the Sacrifice)" Islamic_Fixed Dhu'l-Hiddja 9
+  Event "new year" - "Islamic New Year"                     Islamic_Fixed Muharram 1
+  Event "mouloud"  - "Mouloud (Birth of the Prophet)"       Islamic_Fixed Reb�u'l-awwal 12
+
 # ====================================================================================================
 
 # afghanistan
@@ -555,6 +562,7 @@ Region "be"
   Add   "labor"                   - # "Labor Day"             Fixed May  1
   Add   "c/ascension"             - # "Ascension"             Easter +39
   Add   "c/whitmonday"            - # "Whitmonday"            Easter +50
+# celebrating the crowning of Leopold I 1831
   Event "be/independence"         -   "Independence Day"      Fixed Jul 21  2 days
   Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
   Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
@@ -807,6 +815,7 @@ Region "ca"
   Event "ca/discovery"                     h   "Discovery Day (Newfoundland & Labrador)" Fixed Jun 24
   Event "ca/fete nationale"                h   "Fete Nationale (Quebec)"                 Fixed Jun 24
   Event "ca/national public service week"  h   "National Public Service Week"            WDRel Jun Sun 3rd
+# celebrating ? the british commonwealth 1867
   Event "ca/canada"                        h   "Canada Day"                              Fixed Jul  1
   Event "ca/orangeman"                     h   "Orangeman's Day"                         Fixed Jul 12
   Event "ca/micmac festival of saints/ann" h   "MicMac Festival of St. Ann"              Fixed Jul 30
@@ -887,7 +896,6 @@ Region "cf"
 Region "td"
   Add   "new year"                                           h # "New Year's Day"                                      (1-Jan 2000)
   Add   "islamic/al fitr"                                    h # "Id al Fitr (End of Ramadan)"                         (8-Jan 2000)
-  Add   "islamic/al fitr"                                    h # "Id al Fitr (End of Ramadan)"                         (28-Dec 2000)
   Add   "islamic/al adha"                                    h # "Id al-Adha"                                          (16-Mar 2000)
   Event "td/creation of the union of central african states" -   "Creation of the Union of Central African States Day" Fixed Apr  2
   Event "td/national"                                        h   "National Day"                                        Fixed Apr 13
@@ -949,7 +957,8 @@ Region "cn"
 # China Kwan Kung 29-Jul moveable but still researching
   Event "cn/peoples liberation army"    h   "People's Liberation Army Day" Fixed Aug  1
 # Event "china/mid autumn festival"     h "Mid Autumn Festival"                    China Mid Autumn Festival 12-Sep 1-Oct 21-Sep 11-Sep 28-Sep moveable
-  Event "cn/pr chinas birthday"         h   "P.R. China's Birthday"        Fixed Oct  1
+# foundation of the republic in 1949:
+  Event "cn/birthday"         h   "China's Birthday"        Fixed Oct  1
   Event "cn/national"                   h   "National Day"                 Fixed Oct  2
 
 #--------------------------------------------------------------
@@ -1185,6 +1194,7 @@ Region "dk"
   Event "dk/liberation"               -   "Liberation Day"                 Fixed May  5
   Event "dk/prince fredriks birthday" h   "Prince Fredrik's Birthday"      Fixed May 26
   Add   "c/ascension"                 h # "Ascension Thursday"             (11-Jun 2000)
+# celebrating the constitution 1849, 1915 and 1953
   Event "dk/constitution"             h   "Constitution Day"               Fixed Jun  5
 # Denmark Father's Day Fars Dag 5-Jun
   Add   "c/pentecost"                 h # "Pentecost"                      (11-Jun 2000)
@@ -1471,6 +1481,7 @@ Region "fi"
   Event "fi/all saint"            h   "All Saint's Day"       Fixed Nov  1
   Event "fi/alexis kivi"          -   "Alexis Kivi Day"       Fixed Oct 10
   Event "fi/father"               h   "Father's Day"          WDRel Nov Sun 2nd
+# independence 1917
   Event "fi/independence"         h   "Independence Day"      Fixed Dec  6
   Add   "c/christmas eve"         - # "Christmas Eve"         Fixed Dec 24
   Add   "c/christmas2d"           h # "Christmas"             (25-Dec 2000)
@@ -1493,6 +1504,7 @@ Region "fr"
   Add   "c/pentecost monday"         h # "Pentecost Monday"        (12-Jun 2000)
   Event "fr/fathers"                 -   "Father's Day"            WDRel Jun Sun 2nd
   Event "fr/night watch"             -   "Night Watch"             Fixed Jul 13
+# celebrating the storming of the Bastille 1789
   Event "fr/bastille"                -   "Bastille Day"            Fixed Jul 14
   Event "fr/marseillaise"            -   "Marseillaise Day"        Fixed Jul 30
   Event "fr/la fete de la magdalene" h   "La Fete de la Magdalene" Fixed Jul 11
@@ -1695,6 +1707,7 @@ Region "gr"
   Event "gr/clean monday"              -   "Clean Monday"                  Julian_Easter -41 # ?
   Event "gr/lent monday"               h   "Lent Monday (Julian Calendar)" Julian_Easter -48
   Event "gr/dodecanese accession"      -   "Dodecanese Accession Day"      Fixed Mar  7
+# the outbreak of the war of independence 1821
   Event "gr/independence"              h   "Independence Day"              Fixed Mar 25
   Add   "orthodox/good friday"         - # "Good Friday"                   Julian_Easter -2
   Add   "orthodox/holy saturday"       - # "Holy Saturday"                 Julian_Easter -1
@@ -1942,107 +1955,253 @@ Region "hu"
   Add   "c/christmas2d"           h # "Christmas"             Fixed Dec 25  2 days
 
 
-# iceland
+#--------------------------------------------------------------
+# Iceland
+#--------------------------------------------------------------
 Region "is"
-  Event "is/independence"         - "Independence Day"        Fixed Jun 17
-
+  Add   "new year"                h # "New Year's Day"        (1-Jan 2000)
+  Event "iceland/first of summer" h # "First Day of Summer"   WDRel Apr 19 Thu +1 incl
+  Add   "c/holy thursday"         h # "Holy Thursday"         (20-Apr 2000)
+  Add   "c/good friday"           h # "Good Friday"           (21-Apr 2000)
+  Add   "c/easter"                h # "Easter Sunday"         (23-Apr 2000)
+  Add   "c/easter monday"         h # "Easter Monday"         (24-Apr 2000)
+  Event "is/children"             h   "Children's Day"        Fixed Apr 25
+  Add   "labor"                   h # "Labor Day"             (1-May 2000)
+  Add   "c/ascension"             h # "Ascension Thursday"    (1-Jun 2000)
+  Add   "c/pentecost"             h # "Pentecost"             (11-Jun 2000)
+  Add   "c/pentecost monday"      h # "Pentecost Monday"      (12-Jun 2000)
+  Event "is/independence"         h   "Independence Day"      Fixed Jun 17
+  Event "is/commerce"             h   "Commerce Day"          WDRel Aug Mon 1st
+  Add   "c/christmas eve"         h # "Christmas Eve"         (24-Dec 2000)
+  Add   "c/christmas"             h # "Christmas"             (25-Dec 2000)
+  Event "is/2nd of christmas"     h   "2nd day of Christmas"  Fixed Dec 25
+  Add   "new years eve"           h # "New Year's Eve"        (31-Dec 2000)
 
-# india
+#--------------------------------------------------------------
+# India
+#--------------------------------------------------------------
 Region "in"
+  Add   "new year"
+  Add   "islamic/al fitr"             h
+  Event "iduz zuha"                   h   "Idu'z Zuha / Bakrid (Feast of the Sacrifice)" Islamic_Fixed Dhu'l-Hiddja 9
+# India Mahavir Jayanti 29-Mar still researching
+  Add   "islamic/new year"            h # "Muharram (Islamic New Year) (Muslim/Islam)"                  Islamic_Fixed Muharram 1
   Event "in/republic"                 - "Republic Day"                 Fixed Jan 26
   Event "in/mahatma gandhi martyrdom" - "Mahatma Gandhi Martyrdom Day" Fixed Jan 30
-  Event "in/indian independence"      - "Indian Independence Day"      Fixed Aug 15
-  Event "in/mahatma gandhi jayanti"   - "Mahatma Gandhi Jayanti"       Fixed Oct  2
+  Add   "c/good friday"               h # "Good Friday (Christian)"                                     (21-Apr 2000)
+  Add   "c/easter"                    h # "Easter Sunday (Christian)"                                   (23-Apr 2000)
+# Event "india/buddha purnima"          h "Buddha Purnima"                         India Buddha Purnima 11-May 30-Apr 19-May ? ? moveable
+  Add   "islamic/mouloud"             h
+  Event "in/independence"             h   "Independence Day"                                            Fixed Aug 15
+# India Patesi (Paris/Zorastra) 21-Aug still researching
+  Event "in/mahatma gandhis birthday" h   "Mahatma Gandhi's Birthday"                                   Fixed Oct  2
+# India Dussera; Vijaya Damami; Ramlila 5-Oct still researching
+  Event "in/guru nanaks birthday"     h   "Guru Nanak's Birthday"                                       Fixed Nov 11
+  Add   "c/christmas"                 h # "Christmas (Christian)"                                       (25-Dec 2000)
 
-
-# indonesia
+#--------------------------------------------------------------
+# Indonesia
+#--------------------------------------------------------------
 Region "id"
-  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "new year"                h # "New Year's Day"                              (1-Jan 2000)
+# Indonesia Id al Fitr (End of Ramadan) 8-Jan
+  Add   "islamic/al fitr"         h # "Id al Fitr (End of Ramadan)"                 (28-Dec 2000)
   Add   "c/good friday"           - # "Good Friday"           Easter -2
+  Add   "chinese/new year"        h # "Chinese New Year (Year of the Dragon)"       (Feb 5-7 2000)
+  Event "id/muharram"             h   "Muharram (Islamic New Year)"                 Islamic_Fixed Muharram 1
+  Add   "c/good friday"           h # "Good Friday"                                 (21-Apr 2000)
+# Indonesia Kartini Day 21-Apr still researching
   Event "id/kartini"              -   "Kartini Day"           Fixed Apr 21
-  Add   "c/ascension"             - # "Ascension"             Easter +39
-  Event "id/independence"         -   "Independence Day"      Fixed Aug 17
-  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
-
+# Event "indonesia/waisak"              h "Waisak Day (Buddha's Birthday)"         Indonesia Waisak Day (Buddha's Birthday) 11-May 30-Apr 19-May ? ? moveable
+  Add   "c/ascension"             h # "Ascension Thursday"                          (1-Jun 2000)
+# Indonesia Galungan 9-Jun still researching
+  Event "id/mouloud"              h   "Mouloud (Prophet's Birthday)"                Islamic_Fixed Reb�u'l-awwal 12
+# Indonesia Kuningan 19-Jun still researching
+  Event "id/national children"    h   "National Children's Day"                     Fixed Jul 23
+  Event "id/indonesian national"  h   "Indonesian National Day"                     Fixed Aug 17
+  Add   "islamic/al miraj"        h # "Leilat al-Meiraj (Ascension of the Prophet)" (26-Oct 2000)
+  Add   "c/christmas"             h # "Christmas"                                   (25-Dec 2000)
 
-# iran
+#--------------------------------------------------------------
+# Iran
+#--------------------------------------------------------------
 Region "ir"
-  Event "ir/revolution"            - "Revolution Day"          Fixed Feb 11
-  Event "ir/oil nationalization"   - "Oil Nationalization Day" Fixed Mar 20
-  Event "ir/no ruz"                - "No Ruz"                  Fixed Mar 21
-  Event "ir/islamic republic"      - "Islamic Republic Day"    Fixed Apr  1
-  Event "ir/revolution2"           - "Revolution Day"          Fixed Apr  2
-  Event "ir/martyrdom of imam ali" - "Martyrdom of Imam Ali"   Fixed Jul 14
-  Event "ir/constitution"          - "Constitution Day"        Fixed Aug  5
-
+  Add   "new year"                h # "New Year's Day"                      (1-Jan 2000)
+# Iran Id al Fitr (End of Ramadan) 8-Jan
+  Add   "islamic/al fitr"         h # "Id al Fitr (End of Ramadan)"         (28-Dec 2000)
+# Iran Martyrdom of Imam Ali 20-Jan still researching
+# Iran Victory Day of the Revolution 11-Feb still researching
+# Iran Birth of Imam Reza 10-Mar still researching
+  Event "ir/id al adha"           h   "Id al Adha (Feast of the Sacrifice)" Islamic_Fixed Dhu'l-Hiddja 9
+  Event "ir/petroleum"            h   "Petroleum Day"                       Fixed Mar 20
+  Event "ir/noruz"                h   "Noruz"                               Fixed 25  Mar 21
+  Event "ir/republic"             h   "Republic Day"                        Fixed Apr  1
+  Event "ir/national picnic"      h   "Sizdah-bedar / National Picnic Day"  Fixed Apr  2
+  Event "ir/muharram"             h   "Muharram (Islamic New Year)"         Islamic_Fixed Muharram 1
+  Event "ir/ashura"               h   "Ashura (2 days)"                     Islamic_Fixed Muharram 10
+# Iran Deathday of Imam Khomeini 4-Jun still researching
+# Iran 15th of Khordad 5-Jun still researching
+# Iran Chhelum 5-Jun still researching
+# Iran Muhammad's Deathday 13-Jun still researching
+  Event "ir/mouloud"              h   "Mouloud (Birth of the Prophet)"      Islamic_Fixed Reb�u'l-awwal 12
+# Iran Week of Unification begins 25-Jun still researching
+# Iran Birthday of the 1st Imam 23-Oct still researching
+  Event "ir/lailat almiraj"       h   "Lailat al-Miraj"                     Islamic_Fixed Redjeb 27
+# Iran Birthday of the 12th Imam 24-Nov still researching
+# Iran National Day 16-Dec still researching
 
-# iraq
+#--------------------------------------------------------------
+# Iraq
+#--------------------------------------------------------------
+# I'm a tad uncertain if some of the dates should be in the western of islamic calendar
 Region "iq"
-  Add   "new year"                 - # "New Year's Day"            Fixed Jan  1
-  Event "iq/army"                  -   "Army Day"                  Fixed Jan  6
-  Event "iq/14 ramadan revolution" -   "14 Ramadan Revolution Day" Fixed Feb  8
-  Event "iq/republic"              -   "Republic Day"              Fixed Jul 14
-  Event "iq/july revolution"       -   "July Revolution Day"       Fixed Jul 17
+  Add   "new year"                  h # "New Year's Day"                              (1-Jan 2000)
+  Event "iq/army"                   h   "Army Day"                                    Fixed Jan  6
+# Iraq Id al Fitr (End of Ramadan) 8-Jan
+  Add   "islamic/al fitr"           h # "Id al Fitr (End of Ramadan)"                 (28-Dec 2000)
+  Event "iq/revolution anniversary" h   "Revolution Anniversary"                      Fixed Feb  8
+  Add   "islamic/al adha"           h # "Id al-Adha (4 days)"                         (16-Mar 2000)
+  Event "iq/spring"                 h   "Spring Day"                                  Fixed Mar 21
+  Event "iq/hijra new year"         h   "Hijra New Year"                              Islamic_Fixed Muharram 1
+  Event "iq/ashoura"                h   "Ashoura"                                     Islamic_Fixed Muharram 10
+  Event "iq/fao"                    h   "FAO Day"                                     Fixed Apr 17
+  Add   "labor"                     h # "Labor Day"                                   (1-May 2000)
+  Event "iq/mouloud"                h   "Mouloud (Prophet's Birthday)"                Islamic_Fixed Reb�u'l-awwal 12
+  Event "iq/national"               h   "National Day"                                Fixed Jul 14
+  Event "iq/baath revolution"       h   "Ba'ath Revolution Day"                       Fixed Jul 17
+  Event "iq/peace"                  h   "Peace Day (End of the Iran/Iraq war)"        Fixed Aug  8
+  Event "iq/leilet almeiraj"        h   "Leilet al-Meiraj (Ascension of the Prophet)" Islamic_Fixed Redjeb 27
 
-
-# ireland
+#--------------------------------------------------------------
+# Ireland 
+#--------------------------------------------------------------
 Region "ie"
-  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
+  Add   "c/epiphany"                    h # "Epiphany" (6-Jan 2000)
+# St. Patrick is the saint of Ireland
+  Add   "saints/patrick"                h # "St. Patrick's Day" (17-Mar 2000)
   Event "ie/sheelahs"             -   "Sheelah's Day"         Fixed Mar 18
-  Add   "c/good friday"           - # "Good Friday"           Easter -2
-  Add   "c/easter monday"         - # "Easter Monday"         Easter +1
-  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
-  Add   "saints/stephen"          - # "St. Stephen"           Fixed Dec 26
+  Add   "c/good friday"                 h # "Good Friday" (21-Apr 2000)
+  Add   "c/easter"                      h # "Easter Sunday" (23-Apr 2000)
+  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
+  Event "ie/may holiday"           h "May Holiday"                            WDRel May Mon 1st
+  Event "ie/republic"              h "Republic Day"                           Fixed Jun  1
+  Event "ie/june holiday"          h "June Holiday"                           WDRel Jun Mon 1st
+  Event "ie/battle of the boyne"   h "Battle of the Boyne Day"                Fixed Jul 12
+  Event "ie/orangeman"             h "Orangeman's Day"                        Fixed Jul 12
+  Event "ie/day of the virgin mary"  h "Day of the Virgin Mary"               Fixed Aug 15
+# Ireland Feast of Tailiu 17-Jul still researching
+  Event "ie/august holiday"        h "August Holiday"                         WDRel Aug Mon 1st
+  Event "ie/all saint"             h "All Saints Day"                         Fixed Nov  1
+# Event "ie/october holiday"       h "October Holiday"                        Ireland October Holiday 23-Oct 22-Oct 21-Oct 20-Oct 18-Oct Last Monday in October (??)
+  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
+  Add   "saints/stephen"                h # "St. Stephen's Day" (26-Dec 2000)
 
+#--------------------------------------------------------------
+# Isle of Man 
+#--------------------------------------------------------------
+Region "isle of man" # what's the region code?
+  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
+  Add   "c/good friday"                 h # "Good Friday" (21-Apr 2000)
+  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
+  Event "isle of man/may"               h "May Day"                                WDRel May Mon 1st
+  Event "isle of man/spring bank holiday"  h "Spring Bank Holiday"                 WDRel May Mon last
+  Event "isle of man/tynwald"           h "Tynwald Day"                            Fixed Jul  5
+  Event "isle of man/senior race"       h "Senior Race Day"                        Fixed Jul  9
+  Event "isle of man/summer bank holiday"  h "Summer Bank Holiday"                 WDRel Aug Mon last
+  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
+  Add   "c/boxing"                      h # "Boxing Day" (26-Dec 2000)
 
-# israel
+#--------------------------------------------------------------
+# Israel 
+#--------------------------------------------------------------
 Region "il"
+  Event "il/fast of tebet"          h "Fast of Tebet"                          Jewish_Fixed 10 Tebet
+  Event "il/new year of trees"      h "Tu B'Shevat / New Year of Trees"        Jewish_Fixed 15 Shevat
+  Event "il/feast of lots"          h "Purim / Feast of Lots"                  Jewish_Fixed 14 Adar
+  Event "il/pesah"                  h "Pesah (Start of Passover)"              Jewish_Fixed 15 Nisan
+  Event "il/holocaust memorial"     h "Yom HaShoah / Holocaust Memorial Day"   Jewish_Fixed 27 Nisan
+  Event "il/fallen soldiers memorial"  h "Yom Hazikaron / Fallen Soldiers Memorial Day" Jewish_Fixed 3 Iyar
+  Event "il/independence"           h "Yom Ha Atzmaut / Independence Day"      Jewish_Fixed 4 Iyar
+  Event "il/lag bomer"              h "Lag B'omer"                             Jewish_Fixed 18 Iyar
+  Event "il/jerusalem"              h "Yom Yerushalayim / Jerusalem Day"       Jewish_Fixed 28 Iyar
+  Event "il/giving of the torah"    h "Shavout / Giving of the Torah"          Jewish_Fixed 6 Sivan
+  Event "il/shiva asar btammuz"     h "Shiva Asar B'Tammuz"                    Jewish_Fixed 17 Tammuz
+  Event "il/tisha bav"              h "Tisha B'Av"                             Jewish_Fixed 9 Av
+  Event "il/rosh hashanah"          h "Rosh Hashanah ;"                        Jewish_Fixed 1 Tishri
+  Event "il/atonement"              h "Yom Kippur / Atonement Day"             Jewish_Fixed 10 Tishri
+  Event "il/sukkot hoshana raba"    h "Sukkot Hoshana Raba"                    Jewish_Fixed 15 Tishri
+  Event "il/simhat torah"           h "Simhat Torah (Rejoicing the Law)"       Jewish_Fixed 22 Tishri
+  Event "il/festival of lights"     h "Chanukah / Festival of Lights"          Jewish_Fixed 25 Kislev
   Event "il/jerusalem reunification" - "Jerusalem Reunification Day" Fixed May 12
   Event "il/balfour declaration"     - "Balfour Declaration Day"     Fixed Nov  2
 
-
-# italy
+#--------------------------------------------------------------
+# Italy
+#--------------------------------------------------------------
 Region "it"
-  Add   "c/epiphany"                     - # "Epiphany"                    Fixed Jan  6
-  Event "it/befana"                      -   "Befana Day"                  Fixed Jan  6
-  Event "it/day of conciliation"         -   "Day of Conciliation"         Fixed Feb 11
-  Event "it/natale di roma"              -   "Natale di Roma"              Fixed Apr 21
-  Event "it/liberation"                  -   "Liberation Day"              Fixed Apr 25
-  Event "it/anniversary of the republic" -   "Anniversary of the Republic" Fixed Jun  2
-  Event "it/festa del redentore"         -   "Festa del Redentore"         WDRel Jul Sun 3rd
-  Event "it/joust of the quintana"       -   "Joust of the Quintana"       WDRel Aug Sun 1st
-  Event "it/palio del golfo"             -   "Palio Del Golfo"             WDRel Aug Sun 2nd
-  Add   "c/christmas"                    - # "Christmas Day"               Fixed Dec 25
-  Event "it/santo stefano"               -   "Santo Stefano"               Fixed Dec 26
+# Event "italy/new year 1jan"           h " New Year's Day 1-Jan"                  Italy  New Year's Day 1-Jan 1-Jan 1-Jan 1-Jan 1-Jan static
+  Add   "c/epiphany"                     h # "Epiphany"                     (6-Jan 2000)
+  Event "it/carnival starts"             h   "Carnival starts"              Easter -58
+  Event "it/carnival ends"               h   "Carnival ends"                Easter -47
+  Add   "c/easter"                       h # "Easter Sunday"                (23-Apr 2000)
+  Add   "c/easter monday"                h # "Easter Monday"                (24-Apr 2000)
+  Event "it/liberation"                  h   "Liberation Day"               Fixed Apr 25
+  Add   "labor"                          h # "Labor Day"                    (1-May 2000)
+  Add   "mothers"                        h # "Mother's Day"                 (14-May 2000)
+  Event "italy/republic"                h "Republic Day"                          WDRel Jun 1 Sun 0
+  Event "it/saints/john"                 h   "St. John's Day"               Fixed Jun 24
+  Event "it/saints/peters & saints/paul" h   "St. Peter's & St. Paul's Day" Fixed Jun 29
+  Event "it/saints/rosalia"              h   "St. Rosalia Day"              Fixed Jul 11
+  Add   "c/assumption"                   h # "Assumption Day"               (15-Aug 2000)
+  Event "it/saints/januariu"             h   "St. Januarius Day"            Fixed Sep 19
+  Event "it/saints/petroniu"             h   "St. Petronius Day"            Fixed Oct  4
+  Event "it/all saint"                   h   "All Saint's Day"              Fixed Nov  1
+  Event "it/national unity"              h   "National Unity Day"           WDRel Nov Sun 1st
+  Event "it/saints/nicholas"             h   "St. Nicholas' Day"            Fixed Dec  6
+  Event "it/saints/ambrose"              h   "St. Ambrose Day"              Fixed Dec  7
+  Add   "c/immaculate conception"        h # "Immaculate Conception"        (8-Dec 2000)
+  Add   "c/christmas"                    h # "Christmas"                    (25-Dec 2000)
+  Add   "saints/stephen"                 h # "St. Stephen's Day"            (26-Dec 2000)
 
 
-# ivory coast
+#--------------------------------------------------------------
+# Ivory Coast
+#--------------------------------------------------------------
 Region "ci"
-  Add   "new year"                               - # "New Year's Day"                      Fixed Jan  1
+  Add   "new year"                             h # "New Year's Day"                         (1-Jan 2000)
+  Add   "islamic/al fitr"                      h # "Id al Fitr (End of Ramadan)"            (28-Dec 2000)
+  Add   "islamic/al adha"                      h # "Id al-Adha"                             (16-Mar 2000)
   Add   "c/good friday"                          - # "Good Friday"                         Easter -2
-  Add   "c/easter monday"                        - # "Easter Monday"                       Easter +1
-  Add   "labor"                                  - # "Labor Day"                           Fixed May  1
-  Add   "c/ascension"                            - # "Ascension"                           Easter +39
-  Add   "c/whitmonday"                           - # "Whitmonday"                          Easter +50
-  Add   "c/assumption"                           - # "Assumption Day"                      Fixed Aug 15
-  Add   "c/all saints"                           - # "All Saints Day"                      Fixed Nov  1
+  Add   "c/easter monday"                      h # "Easter Monday"                          (24-Apr 2000)
+  Add   "labor"                                h # "Labor Day"                              (1-May 2000)
+  Add   "c/ascension"                          h # "Ascension Thursday"                     (1-Jun 2000)
+  Add   "c/pentecost monday"                   h # "Pentecost Monday"                       (12-Jun 2000)
+  Event "ci/independence"                      h   "Independence Day"                       Fixed Aug  7
+  Add   "c/assumption"                         h # "Assumption Day"                         (15-Aug 2000)
+  Event "ci/all saint"                         h   "All Saint's Day"                        Fixed Nov  1
+  Event "ci/peace"                             h   "Peace Day"                              Fixed Nov 15
+  Event "ci/felix houphouetboigny remembrance" h   "Felix Houphouet-Boigny Remembrance Day" Fixed Dec  7
+  Event "ci/national"                          h   "National Day"                           Fixed Dec  7
   Event "ci/independence"                        -   "Independence Day"                    Fixed Dec  7
-  Event "ci/national holiday of the ivory coast" -   "National Holiday of the Ivory Coast" Fixed Dec  7
-  Add   "c/christmas"                            - # "Christmas Day"                       Fixed Dec 25
+  Add   "c/christmas"                          h # "Christmas"                              (25-Dec 2000)
 
-
-# jamaica
+#--------------------------------------------------------------
+# Jamaica
+#--------------------------------------------------------------
 Region "jm"
-  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
-  Add   "c/ash wednesday"         - # "Ash wednesday"         Easter -46
-  Add   "c/good friday"           - # "Good Friday"           Easter -2
-  Add   "c/easter monday"         - # "Easter Monday"         Easter +1
-  Add   "labor"                   - # "Labor Day"             Fixed May  1
-  Event "jm/labor"                -   "Labour Day"            Fixed May 23
-  Event "jm/independence"         -   "Independence Day"      WDRel Aug Mon 1st
-  Event "jm/heroes"               -   "Heroes' Day"           WDRel Oct Mon 3rd
-  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
-
+  Add   "new year"                h # "New Year's Day"        (1-Jan 2000)
+  Event "jm/maroon"  h "Maroon Day" Fixed Jan  6
+  Event "jm/bob marley"  h "Bob Marley Day" Fixed Feb  6
+  Add   "c/ash wednesday"         h # "Ash Wednesday"         (8-Mar 2000)
+  Add   "c/good friday"           h # "Good Friday"           (21-Apr 2000)
+  Add   "c/easter monday"         h # "Easter Monday"         (24-Apr 2000)
+  Add   "labor"  h
+  Event "jm/independence"  h "Independence Day" WDRel Aug Mon 1st
+  Event "jm/emancipation"  h "Emancipation Day" WDRel Aug Sun 1st
+  Event "jm/heroes"  h "Heroes' Day" WDRel Oct Mon 3rd
+  Add   "c/christmas"             h # "Christmas"             (25-Dec 2000)
+  Add   "c/boxing"                h # "Boxing Day"            (26-Dec 2000)
 
 # japan
 Region "jp"
@@ -2633,20 +2792,36 @@ Region "mp"
   Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
-# norway
+#--------------------------------------------------------------
+# Norway
+#--------------------------------------------------------------
 Region "no"
-  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "new year"                              h # "New Year's Day"                                                  (1-Jan 2000)
   Event "no/tyvendedagen"         -   "Tyvendedagen"          Fixed Jan 13
-  Add   "c/holy thursday"         - # "Holy Thursday"         Easter -3
-  Add   "c/good friday"           - # "Good Friday"           Easter -2
-  Add   "c/easter monday"         - # "Easter Monday"         Easter +1
-  Add   "may day"                 - # "May Day"               Fixed May  1
-  Event "no/constitution"         -   "Constitution Day"      Fixed May 17
-  Add   "c/ascension"             - # "Ascension"             Easter +39
-  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50
+  Event "no/mother"                             h   "Mother's Day"                                                    WDRel Feb Sun 2nd
+  Event "no/birthday of king harald v"          h   "Birthday of King Harald V"                                       Fixed Feb 21
+  Add   "c/holy thursday"                       h # "Holy Thursday"                                                   (20-Apr 2000)
+  Add   "c/good friday"                         h # "Good Friday"                                                     (21-Apr 2000)
+  Add   "c/easter"                              h # "Easter Sunday"                                                   (23-Apr 2000)
+  Add   "c/easter monday"                       h # "Easter Monday"                                                   (24-Apr 2000)
+  Event "no/may"                                h   "May Day"                                                         Fixed May  1
+  Event "no/liberation"                         h   "Liberation day (Liberation from Germany after WW2)"              Fixed May  8
+# celebration of the Eidsvold constitution in 1814
+  Event "no/constitution"                       h   "Constitution Day"                                                Fixed May 17
+  Add   "c/ascension"                           h # "Ascension Thursday"                                              (1-Jun 2000)
+  Event "no/union dissolution"                  h   "Union Dissolution (Norway gains independence from Sweden, 1905)" Fixed Jun  7
+  Add   "c/pentecost"                           h # "Pentecost"                                                       (11-Jun 2000)
+  Add   "c/pentecost monday"                    h # "Pentecost Monday"                                                (12-Jun 2000)
+  Event "no/midsummer night"                    h   "Midsummer Night"                                                 Fixed Jun 24
+  Event "no/birthday of queen sonja"            h   "Birthday of Queen Sonja"                                         Fixed Jul  4
+  Event "no/birthday of crown prince haakon"    h   "Birthday of Crown Prince Haakon"                                 Fixed Jul 20
   Event "no/olsok eve festival"   -   "Olsok Eve Festival"    Fixed Jul 29
-  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
-
+  Event "no/birthday of princess martha louise" h   "Birthday of Princess Martha Louise"                              Fixed Sep 22
+  Event "no/fathers"                            h   "Fathers' Day "                                                   WDRel Nov Sun 2nd
+  Add   "c/christmas eve"                       h # "Christmas Eve"                                                   (24-Dec 2000)
+  Add   "c/christmas"                           h # "Christmas"                                                       (25-Dec 2000)
+  Event "no/2nd of christmas"                   h   "2nd day of Christmas"                                            Fixed Dec 26
+  Add   "new years eve"                         h # "New Year's Eve"                                                  (31-Dec 2000)
 
 # oman
 Region "om"
@@ -4324,6 +4499,7 @@ Region "yu"
   Event "yu/freedom fighters"     -   "Freedom Fighters' Day"           Fixed Jul  4
   Event "yu/freedom serbia"       -   "Freedom Rising Day (Serbia)"     Fixed Jul  7
   Event "yu/freedom montenegro"   -   "Freedom Rising Day (Montenegro)" Fixed Jul 14
+# foundation of the republic in 1945
   Event "yu/republic"             -   "Republic Day"                    Fixed Nov 29
 
 
-- 
GitLab