Always put ADDOMIT before SCANFROM for consistency.

include/holidays/ad/02.rem

@@ -9,6 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ad.rem
 
-REM Third Saturday in July SCANFROM -28 ADDOMIT MSG Canillo Annual Festival
+REM Third Saturday in July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
 REM Sunday 16 July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
 REM Monday 17 July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival

include/holidays/ad/07.rem

@@ -9,6 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ad.rem
 
-REM First Saturday in August SCANFROM -28 ADDOMIT MSG Andorra la Vella Annual Festival
+REM First Saturday in August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival
 REM Sunday 2 August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival
 REM Monday 3 August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival

include/holidays/ae.rem

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for UnitedArabEmirates
+# Holiday file for United Arab Emirates
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 

include/holidays/ao.rem

@@ -4,36 +4,36 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Dia do Ano Novo
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 4] MSG Dia do Ano Novo (ponte)
-REM 3 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 4)) == 2] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 4] MSG Dia do Ano Novo (ponte)
+REM 3 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 4)) == 2] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
 OMIT 4 February MSG Dia do Início da Luta Armada de Libertação Nacional
-REM 5 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 4)) == 4] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
-REM 12 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 13)) == 2] MSG Dia do Carnaval (ponte)
-REM 14 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 13)) == 4] MSG Dia do Carnaval (ponte)
+REM 5 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 4)) == 4] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
+REM 12 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 13)) == 2] MSG Dia do Carnaval (ponte)
+REM 14 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 13)) == 4] MSG Dia do Carnaval (ponte)
 OMIT [easterdate($Uy)-47] MSG Dia do Carnaval
-REM 7 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 2] MSG Dia Internacional da Mulher (ponte)
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 2] MSG Dia Internacional da Mulher (ponte)
 OMIT 8 March MSG Dia Internacional da Mulher
-REM 9 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 4] MSG Dia Internacional da Mulher (ponte)
-REM 22 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 23)) == 2] MSG Dia da Libertação da África Austral (ponte)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 4] MSG Dia Internacional da Mulher (ponte)
+REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 23)) == 2] MSG Dia da Libertação da África Austral (ponte)
 OMIT 23 March MSG Dia da Libertação da África Austral
-REM 24 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 23)) == 4] MSG Dia da Libertação da África Austral (ponte)
-REM 3 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 2] MSG Dia da Paz e Reconciliação Nacional (ponte)
+REM 24 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 23)) == 4] MSG Dia da Libertação da África Austral (ponte)
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 2] MSG Dia da Paz e Reconciliação Nacional (ponte)
 OMIT 4 April MSG Dia da Paz e Reconciliação Nacional
-REM 5 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 4] MSG Dia da Paz e Reconciliação Nacional (ponte)
+REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 4] MSG Dia da Paz e Reconciliação Nacional (ponte)
 OMIT [easterdate($Uy)-2] MSG Sexta-Feira Santa
-REM 30 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Dia Internacional do Trabalhador (ponte)
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Dia Internacional do Trabalhador (ponte)
 OMIT 1 May MSG Dia Internacional do Trabalhador
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Dia Internacional do Trabalhador (ponte)
-REM 16 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 17)) == 2] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Dia Internacional do Trabalhador (ponte)
+REM 16 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 17)) == 2] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
 OMIT 17 September MSG Dia do Fundador da Nação e do Herói Nacional
-REM 18 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 17)) == 4] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
-REM 1 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Dia dos Finados (ponte)
+REM 18 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 17)) == 4] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Dia dos Finados (ponte)
 OMIT 2 November MSG Dia dos Finados
-REM 3 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 4] MSG Dia dos Finados (ponte)
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Dia da Independência Nacional (ponte)
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 4] MSG Dia dos Finados (ponte)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Dia da Independência Nacional (ponte)
 OMIT 11 November MSG Dia da Independência Nacional
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Dia da Independência Nacional (ponte)
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 2] MSG Dia de Natal e da Família (ponte)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Dia da Independência Nacional (ponte)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 2] MSG Dia de Natal e da Família (ponte)
 OMIT 25 December MSG Dia de Natal e da Família
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 4] MSG Dia de Natal e da Família (ponte)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 2] MSG Dia do Ano Novo (ponte)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 4] MSG Dia de Natal e da Família (ponte)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 2] MSG Dia do Ano Novo (ponte)

include/holidays/ar.rem

@@ -11,26 +11,26 @@ OMIT 2 April MSG Día del Veterano y de los Caidos en la Guerra de Malvinas
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT 1 May MSG Día del Trabajo
 OMIT 25 May MSG Día de la Revolución de Mayo
-REM 15 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 17)) == 3] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
-REM 16 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 17)) == 2] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
-OMIT 17 June MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes
+REM 15 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 3] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
+REM 16 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 2] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
+REM 17 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
 OMIT 20 June MSG Paso a la Inmortalidad del General Don Manuel Belgrano
-REM 21 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 17)) == 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
+REM 21 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
 OMIT 9 July MSG Día de la Independencia
-REM 15 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 3] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 2] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-OMIT 17 August MSG Paso a la Inmortalidad del General Don José de San Martin
-REM 20 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 21 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 4] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Respeto a la Diversidad Cultural (observado)
-OMIT 12 October MSG Día del Respeto a la Diversidad Cultural
-REM 15 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 16 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 18 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 3] MSG Día de la Soberanía Nacional (observado)
-REM 19 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 2] MSG Día de la Soberanía Nacional (observado)
-OMIT 20 November MSG Día de la Soberanía Nacional
-REM 23 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 5] MSG Día de la Soberanía Nacional (observado)
-REM 24 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 4] MSG Día de la Soberanía Nacional (observado)
+REM 15 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 3] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 2] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 17 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 20 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 21 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 4] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 18 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 3] MSG Día de la Soberanía Nacional (observado)
+REM 19 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 2] MSG Día de la Soberanía Nacional (observado)
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de la Soberanía Nacional (observado)
+REM 23 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 5] MSG Día de la Soberanía Nacional (observado)
+REM 24 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 4] MSG Día de la Soberanía Nacional (observado)
 OMIT 8 December MSG Inmaculada Concepción de María
 OMIT 25 December MSG Navidad

include/holidays/as.rem

@@ -1,36 +1,38 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for AmericanSamoa
+# Holiday file for American Samoa
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Martin Luther King Jr. Day
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Washington's Birthday
-REM 16 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 17)) == 6] MSG American Samoa Flag Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
+REM 16 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 6] MSG American Samoa Flag Day (observed)
 OMIT 17 April MSG American Samoa Flag Day
-REM 18 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 17)) == 0] MSG American Samoa Flag Day (observed)
-REM Last Monday in May SCANFROM -28 ADDOMIT MSG Memorial Day
-REM 18 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM 18 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 0] MSG American Samoa Flag Day (observed)
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
-REM 15 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 16)) == 6] MSG Manu'a Islands Cession Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 6] MSG Manu'a Islands Cession Day (observed)
 OMIT 16 July MSG Manu'a Islands Cession Day
-REM 17 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 16)) == 0] MSG Manu'a Islands Cession Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labor Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Columbus Day
-REM Second Sunday in October SCANFROM -28 ADDOMIT MSG White Sunday
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 17 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 0] MSG Manu'a Islands Cession Day (observed)
+REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
+REM Second Sunday in October ADDOMIT SCANFROM -28 MSG White Sunday
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
-REM Fourth Thursday in November SCANFROM -28 ADDOMIT MSG Thanksgiving
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+
+# Optional holidays
 REM 14 February MSG Valentine's Day
 REM 17 March MSG Saint Patrick's Day
 REM 31 October MSG Halloween

include/holidays/at.rem

@@ -23,6 +23,8 @@ OMIT 1 November MSG Allerheiligen
 OMIT 8 December MSG Mariä Empfängnis
 OMIT 25 December MSG Christtag
 OMIT 26 December MSG Stefanitag
+
+# Optional holidays
 REM [easterdate($Uy)-2] MSG Karfreitag
 REM 24 December MSG Heiliger Abend
 REM 31 December MSG Silvester

include/holidays/at/1.rem

@@ -9,4 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/at.rem
 
+
+# Optional holidays
 REM 11 November MSG Hl. Martin

include/holidays/at/2.rem

@@ -9,5 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/at.rem
 
+
+# Optional holidays
 REM 19 March MSG Hl. Josef
 REM 10 October MSG Tag der Volksabstimmung

include/holidays/at/3.rem

@@ -9,4 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/at.rem
 
+
+# Optional holidays
 REM 15 November MSG Hl. Leopold

include/holidays/at/4.rem

@@ -9,4 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/at.rem
 
+
+# Optional holidays
 REM 4 May MSG Hl. Florian

include/holidays/at/5.rem

@@ -9,4 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/at.rem
 
+
+# Optional holidays
 REM 24 September MSG Hl. Rupert

include/holidays/at/6.rem

@@ -9,4 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/at.rem
 
+
+# Optional holidays
 REM 19 March MSG Hl. Josef

include/holidays/at/7.rem

@@ -9,4 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/at.rem
 
+
+# Optional holidays
 REM 19 March MSG Hl. Josef

include/holidays/at/8.rem

@@ -9,4 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/at.rem
 
+
+# Optional holidays
 REM 19 March MSG Hl. Josef

include/holidays/at/9.rem

@@ -9,4 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/at.rem
 
+
+# Optional holidays
 REM 15 November MSG Hl. Leopold

include/holidays/au/act.rem

@@ -9,16 +9,18 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Canberra Day
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Canberra Day
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
 REM Monday 27 May ADDOMIT SCANFROM -28 MSG Reconciliation Day
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in October SCANFROM -28 ADDOMIT MSG Labour Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+
+# Optional holidays
 REM First Monday in August SCANFROM -28 MSG Bank Holiday

include/holidays/au/nsw.rem

@@ -9,14 +9,16 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in October SCANFROM -28 ADDOMIT MSG Labour Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+
+# Optional holidays
 REM First Monday in August SCANFROM -28 MSG Bank Holiday

include/holidays/au/nt.rem

@@ -9,17 +9,19 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM First Monday in May SCANFROM -28 ADDOMIT MSG May Day
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Picnic Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM First Monday in May ADDOMIT SCANFROM -28 MSG May Day
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Picnic Day
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+
+# Optional holidays
 REM 24 December MSG Christmas Eve (from 7pm)
 REM 31 December MSG New Year's Eve (from 7pm)

include/holidays/au/qld.rem

@@ -9,14 +9,14 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM First Monday in May SCANFROM -28 ADDOMIT MSG Labour Day
+REM First Monday in May ADDOMIT SCANFROM -28 MSG Labour Day
 REM Wednesday 10 August ADDOMIT SCANFROM -28 MSG The Royal Queensland Show
-REM First Monday in October SCANFROM -28 ADDOMIT MSG King's Birthday
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM First Monday in October ADDOMIT SCANFROM -28 MSG King's Birthday
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)

include/holidays/au/sa.rem

@@ -9,18 +9,20 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Adelaide Cup Day
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Adelaide Cup Day
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in October SCANFROM -28 ADDOMIT MSG Labour Day
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT 26 December MSG Proclamation Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Proclamation Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Proclamation Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Proclamation Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Proclamation Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Proclamation Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Proclamation Day (observed)
+
+# Optional holidays
 REM 24 December MSG Christmas Eve (from 7pm)
 REM 31 December MSG New Year's Eve (from 7pm)

include/holidays/au/tas.rem

@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Eight Hours Day
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Eight Hours Day
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)

include/holidays/au/vic.rem

@@ -9,15 +9,15 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Labour Day
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
 REM Saturday 1 October --8 ADDOMIT SCANFROM -28 MSG Grand Final Day
-REM First Tuesday in November SCANFROM -28 ADDOMIT MSG Melbourne Cup Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM First Tuesday in November ADDOMIT SCANFROM -28 MSG Melbourne Cup Day
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)

include/holidays/au/wa.rem

@@ -9,15 +9,15 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM First Monday in March SCANFROM -28 ADDOMIT MSG Labour Day
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM First Monday in March ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM 26 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG ANZAC Day (observed)
-REM 27 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 25)) == 6] MSG ANZAC Day (observed)
-REM First Monday in June SCANFROM -28 ADDOMIT MSG Western Australia Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG ANZAC Day (observed)
+REM 27 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 6] MSG ANZAC Day (observed)
+REM First Monday in June ADDOMIT SCANFROM -28 MSG Western Australia Day
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)

include/holidays/az.rem

@@ -34,6 +34,8 @@ OMIT 9 November MSG Azərbaycan Respublikasının Dövlət bayrağı günü
 REM 9 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 9))==0 || wkdaynum(date($Ty, 11, 9))==6] MSG Azərbaycan Respublikasının Dövlət bayrağı günü (müşahidə olunur)
 OMIT 31 December MSG Dünya azərbaycanlılarının həmrəyliyi günü
 REM 31 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31))==0 || wkdaynum(date($Ty, 12, 31))==6] MSG Dünya azərbaycanlılarının həmrəyliyi günü (müşahidə olunur)
+
+# Optional holidays
 REM 27 September MSG Anım Günü
 REM 18 October MSG Müstəqilliyin Bərpası Günü
 REM 12 November MSG Konstitusiya Günü

include/holidays/ba.rem

@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for BosniaAndHerzegovina
+# Holiday file for Bosnia And Herzegovina
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
 # Note: This file consists only of the country-wide
-# holidays for BosniaAndHerzegovina.
+# holidays for Bosnia And Herzegovina.
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory

include/holidays/ba/bih.rem

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for subdivision BIH in BosniaAndHerzegovina
+# Holiday file for subdivision BIH in Bosnia And Herzegovina
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
@@ -9,13 +9,13 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ba.rem
 
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
 OMIT 1 March MSG Dan nezavisnosti
 OMIT [easterdate($Uy)-2] MSG Veliki petak (Katolički)
 OMIT [easterdate($Uy)] MSG Uskrs (Katolički)
 OMIT [easterdate($Uy)] MSG Vaskrs (Pravoslavni)
 OMIT [easterdate($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
 OMIT 9 May MSG Dan pobjede nad fašizmom
 OMIT 25 November MSG Dan državnosti
 OMIT 24 December MSG Badnji dan (Katolički)

include/holidays/ba/brc.rem

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for subdivision BRC in BosniaAndHerzegovina
+# Holiday file for subdivision BRC in Bosnia And Herzegovina
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
@@ -9,11 +9,11 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ba.rem
 
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
-REM 8 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Božić (Pravoslavni) (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
+REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Božić (Pravoslavni) (preneseno)
 OMIT 8 March MSG Dan uspostavljanja Brčko distrikta
-REM 9 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG Dan uspostavljanja Brčko distrikta (preneseno)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Božić (Katolički) (preneseno)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG Dan uspostavljanja Brčko distrikta (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Božić (Katolički) (preneseno)

include/holidays/ba/srp.rem

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for subdivision SRP in BosniaAndHerzegovina
+# Holiday file for subdivision SRP in Bosnia And Herzegovina
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
@@ -9,13 +9,13 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ba.rem
 
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
 OMIT 14 January MSG Pravoslavna Nova godina
 OMIT [easterdate($Uy)-2] MSG Veliki petak (Katolički)
 OMIT [easterdate($Uy)] MSG Uskrs (Katolički)
 OMIT [easterdate($Uy)] MSG Vaskrs (Pravoslavni)
 OMIT [easterdate($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
 OMIT 9 May MSG Dan pobjede nad fašizmom
 OMIT 21 November MSG Dan uspostave Opšteg okvirnog sporazuma za mir u Bosni i Hercegovini
 OMIT 24 December MSG Badnji dan (Katolički)

include/holidays/bb.rem

@@ -4,23 +4,23 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 21 January MSG Errol Barrow Day
-REM 22 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 21)) == 0] MSG Errol Barrow Day (observed)
+REM 22 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 21)) == 0] MSG Errol Barrow Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 28 April MSG National Heroes Day
-REM 29 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 28)) == 0] MSG National Heroes Day (observed)
+REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 28)) == 0] MSG National Heroes Day (observed)
 OMIT 1 May MSG May Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
 OMIT [easterdate($Uy)+50] MSG Whit Monday
 OMIT 1 August MSG Emancipation Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Kadooment Day
-REM 2 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 1] MSG Emancipation Day (observed)
-REM 3 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Kadooment Day
+REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 1] MSG Emancipation Day (observed)
+REM 3 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
 OMIT 30 November MSG Independence Day
-REM 1 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Independence Day (observed)
+REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)

include/holidays/be.rem

@@ -15,6 +15,8 @@ OMIT 15 August MSG O. L. V. Hemelvaart
 OMIT 1 November MSG Allerheiligen
 OMIT 11 November MSG Wapenstilstand
 OMIT 25 December MSG Kerstmis
+
+# Optional holidays
 REM [easterdate($Uy)-2] MSG Goede Vrijdag
 REM [easterdate($Uy)+40] MSG Vrijdag na O. L. H. Hemelvaart
 REM 26 December MSG Banksluitingsdag

include/holidays/bf.rem

@@ -1,27 +1,27 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for BurkinaFaso
+# Holiday file for Burkina Faso
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 3 January MSG Revolution Day
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 3)) == 0] MSG Revolution Day (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 3)) == 0] MSG Revolution Day (observed)
 OMIT 8 March MSG International Women's Day
-REM 9 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 5 August MSG Independence Day
-REM 6 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 5)) == 0] MSG Independence Day (observed)
+REM 6 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 5)) == 0] MSG Independence Day (observed)
 OMIT 15 August MSG Assumption Day
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
 OMIT 31 October MSG Martyrs' Day
 OMIT 1 November MSG All Saints' Day
-REM 1 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 31)) == 0] MSG Martyrs' Day (observed)
-REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 31)) == 0] MSG Martyrs' Day (observed)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
 OMIT 11 December MSG Proclamation of Independence Day
-REM 12 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 11)) == 0] MSG Proclamation of Independence Day (observed)
+REM 12 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 11)) == 0] MSG Proclamation of Independence Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)

include/holidays/bg.rem

@@ -27,4 +27,6 @@ OMIT 25 December MSG Рождество Христово
 REM 25 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25))==0 || wkdaynum(date($Ty, 12, 25))==6] MSG Рождество Христово (почивен ден)
 OMIT 26 December MSG Рождество Христово
 REM 26 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26))==0 || wkdaynum(date($Ty, 12, 26))==6] MSG Рождество Христово (почивен ден)
+
+# Optional holidays
 REM 1 November MSG Ден на народните будители

include/holidays/bi.rem

@@ -4,25 +4,25 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 5 February MSG Unity Day
-REM 6 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 5)) == 0] MSG Unity Day (observed)
+REM 6 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 5)) == 0] MSG Unity Day (observed)
 OMIT 6 April MSG President Ntaryamira Day
-REM 7 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG President Ntaryamira Day (observed)
+REM 7 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG President Ntaryamira Day (observed)
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 8 June MSG President Nkurunziza Day
-REM 9 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 8)) == 0] MSG President Nkurunziza Day (observed)
+REM 9 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 8)) == 0] MSG President Nkurunziza Day (observed)
 OMIT 1 July MSG Independence Day
-REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Independence Day (observed)
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Independence Day (observed)
 OMIT 15 August MSG Assumption Day
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
 OMIT 13 October MSG Prince Louis Rwagasore Day
-REM 14 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 13)) == 0] MSG Prince Louis Rwagasore Day (observed)
+REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 13)) == 0] MSG Prince Louis Rwagasore Day (observed)
 OMIT 21 October MSG President Ndadaye's Day
-REM 22 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 21)) == 0] MSG President Ndadaye's Day (observed)
+REM 22 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 21)) == 0] MSG President Ndadaye's Day (observed)
 OMIT 1 November MSG All Saints' Day
-REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)

include/holidays/bn.rem

@@ -4,17 +4,17 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Awal Tahun Masihi
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Awal Tahun Masihi (diperhatikan)
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 5] MSG Awal Tahun Masihi (diperhatikan)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Awal Tahun Masihi (diperhatikan)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 5] MSG Awal Tahun Masihi (diperhatikan)
 OMIT 23 February MSG Hari Kebangsaan
-REM 24 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 23)) == 0] MSG Hari Kebangsaan (diperhatikan)
-REM 24 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 23)) == 5] MSG Hari Kebangsaan (diperhatikan)
+REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 23)) == 0] MSG Hari Kebangsaan (diperhatikan)
+REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 23)) == 5] MSG Hari Kebangsaan (diperhatikan)
 OMIT 31 May MSG Hari Angkatan Bersenjata Diraja Brunei
-REM 1 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 31)) == 0] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
-REM 1 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 31)) == 5] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
+REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 31)) == 0] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
+REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 31)) == 5] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
 OMIT 15 July MSG Hari Keputeraan KDYMM Sultan Brunei
-REM 16 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 15)) == 0] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
-REM 16 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 15)) == 5] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
+REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 15)) == 0] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
+REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 15)) == 5] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
 OMIT 25 December MSG Hari Natal
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Hari Natal (diperhatikan)
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 5] MSG Hari Natal (diperhatikan)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Hari Natal (diperhatikan)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 5] MSG Hari Natal (diperhatikan)

include/holidays/bo.rem

@@ -11,20 +11,20 @@
 # [$SysInclude]/bo/
 
 OMIT 1 January MSG Año Nuevo
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
 OMIT 22 January MSG Día de la Creación del Estado Plurinacional de Bolivia
-REM 23 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 22)) == 0] MSG Día de la Creación del Estado Plurinacional de Bolivia (observado)
+REM 23 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 22)) == 0] MSG Día de la Creación del Estado Plurinacional de Bolivia (observado)
 OMIT [easterdate($Uy)-48] MSG Carnaval
 OMIT [easterdate($Uy)-47] MSG Carnaval
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT 1 May MSG Día del Trabajo
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
 OMIT [easterdate($Uy)+60] MSG Corpus Christi
 OMIT 21 June MSG Año Nuevo Aymara Amazónico
-REM 22 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 21)) == 0] MSG Año Nuevo Aymara Amazónico (observado)
+REM 22 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 21)) == 0] MSG Año Nuevo Aymara Amazónico (observado)
 OMIT 6 August MSG Día de la Independencia de Bolivia
-REM 7 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 6)) == 0] MSG Día de la Independencia de Bolivia (observado)
+REM 7 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 6)) == 0] MSG Día de la Independencia de Bolivia (observado)
 OMIT 17 October MSG Día de la Dignidad Nacional
 OMIT 2 November MSG Día de Todos los Difuntos
 OMIT 25 December MSG Navidad
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Navidad (observado)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Navidad (observado)

include/holidays/br.rem

@@ -20,6 +20,8 @@ OMIT 2 November MSG Finados
 OMIT 15 November MSG Proclamação da República
 OMIT 20 November MSG Dia Nacional de Zumbi e da Consciência Negra
 OMIT 25 December MSG Natal
+
+# Optional holidays
 REM [easterdate($Uy)-48] MSG Carnaval
 REM [easterdate($Uy)-47] MSG Carnaval
 REM [easterdate($Uy)-46] MSG Início da Quaresma

include/holidays/br/pe.rem

@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/br.rem
 
-REM First Sunday in March SCANFROM -28 ADDOMIT MSG Revolução Pernambucana
+REM First Sunday in March ADDOMIT SCANFROM -28 MSG Revolução Pernambucana

include/holidays/bs.rem

@@ -4,21 +4,21 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 10 January MSG Majority Rule Day
-REM 11 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 10)) == 0] MSG Majority Rule Day (observed)
-REM 12 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 10)) == 6] MSG Majority Rule Day (observed)
+REM 11 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 10)) == 0] MSG Majority Rule Day (observed)
+REM 12 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 10)) == 6] MSG Majority Rule Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM First Friday in June SCANFROM -28 ADDOMIT MSG Randol Fawkes Labour Day
+REM First Friday in June ADDOMIT SCANFROM -28 MSG Randol Fawkes Labour Day
 OMIT [easterdate($Uy)+50] MSG Whit Monday
 OMIT 10 July MSG Independence Day
-REM 11 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 10)) == 0] MSG Independence Day (observed)
-REM 12 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 10)) == 6] MSG Independence Day (observed)
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Emancipation Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG National Heroes Day
+REM 11 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 10)) == 0] MSG Independence Day (observed)
+REM 12 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 10)) == 6] MSG Independence Day (observed)
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Emancipation Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG National Heroes Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)

include/holidays/bw.rem

@@ -5,25 +5,25 @@
 
 OMIT 1 January MSG New Year's Day
 OMIT 2 January MSG New Year's Day Holiday
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year's Day Holiday (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year's Day Holiday (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)-1] MSG Holy Saturday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Labour Day Holiday
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Labour Day Holiday
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 1 July MSG Sir Seretse Khama Day
-REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Sir Seretse Khama Day (observed)
-REM Third Monday in July SCANFROM -28 ADDOMIT MSG President's Day
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Sir Seretse Khama Day (observed)
+REM Third Monday in July ADDOMIT SCANFROM -28 MSG President's Day
 REM Tuesday 16 July ADDOMIT SCANFROM -28 MSG President's Day Holiday
 OMIT 30 September MSG Botswana Day
 OMIT 1 October MSG Botswana Day Holiday
-REM 2 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 1)) == 0] MSG Botswana Day Holiday (observed)
-REM 2 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG Botswana Day (observed)
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 1)) == 0] MSG Botswana Day Holiday (observed)
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG Botswana Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day Holiday
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day Holiday

include/holidays/bz.rem

@@ -3,39 +3,39 @@
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 
-OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-OMIT 15 January MSG George Price Day
-REM 16 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 15)) == 0] MSG George Price Day (observed)
-REM 6 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 4] MSG National Heroes and Benefactors Day (observed)
-REM 7 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 3] MSG National Heroes and Benefactors Day (observed)
-REM 8 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 2] MSG National Heroes and Benefactors Day (observed)
-OMIT 9 March MSG National Heroes and Benefactors Day
-REM 10 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 0] MSG National Heroes and Benefactors Day (observed)
-REM 12 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 5] MSG National Heroes and Benefactors Day (observed)
+REM 1 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 15 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG George Price Day (observed)
+REM 16 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 15)) == 0] MSG George Price Day (observed)
+REM 6 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 4] MSG National Heroes and Benefactors Day (observed)
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 3] MSG National Heroes and Benefactors Day (observed)
+REM 8 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 2] MSG National Heroes and Benefactors Day (observed)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG National Heroes and Benefactors Day (observed)
+REM 10 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 0] MSG National Heroes and Benefactors Day (observed)
+REM 12 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 5] MSG National Heroes and Benefactors Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)-1] MSG Holy Saturday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 29 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 4] MSG Emancipation Day (observed)
-REM 30 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 3] MSG Emancipation Day (observed)
-REM 31 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 2] MSG Emancipation Day (observed)
-OMIT 1 August MSG Emancipation Day
-REM 2 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
-REM 4 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 5] MSG Emancipation Day (observed)
-OMIT 10 September MSG Saint George's Caye Day
-REM 11 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 10)) == 0] MSG Saint George's Caye Day (observed)
-OMIT 21 September MSG Independence Day
-REM 22 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Independence Day (observed)
-REM 9 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Indigenous Peoples' Resistance Day (observed)
-REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Indigenous Peoples' Resistance Day (observed)
-REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Indigenous Peoples' Resistance Day (observed)
-OMIT 12 October MSG Indigenous Peoples' Resistance Day
-REM 13 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Indigenous Peoples' Resistance Day (observed)
-REM 15 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Indigenous Peoples' Resistance Day (observed)
-OMIT 19 November MSG Garifuna Settlement Day
-REM 20 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Garifuna Settlement Day (observed)
+REM 1 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 4] MSG Emancipation Day (observed)
+REM 30 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 3] MSG Emancipation Day (observed)
+REM 31 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 2] MSG Emancipation Day (observed)
+REM 1 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Emancipation Day (observed)
+REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
+REM 4 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 5] MSG Emancipation Day (observed)
+REM 10 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Saint George's Caye Day (observed)
+REM 11 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 10)) == 0] MSG Saint George's Caye Day (observed)
+REM 21 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Independence Day (observed)
+REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Independence Day (observed)
+REM 9 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Indigenous Peoples' Resistance Day (observed)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Indigenous Peoples' Resistance Day (observed)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Indigenous Peoples' Resistance Day (observed)
+REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Indigenous Peoples' Resistance Day (observed)
+REM 13 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Indigenous Peoples' Resistance Day (observed)
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Indigenous Peoples' Resistance Day (observed)
+REM 19 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Garifuna Settlement Day (observed)
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Garifuna Settlement Day (observed)
 OMIT 25 December MSG Christmas Day
-OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)

include/holidays/ca.rem

@@ -11,25 +11,25 @@
 # [$SysInclude]/ca/
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM Monday 18 May ADDOMIT SCANFROM -28 MSG Victoria Day
 OMIT 1 July MSG Canada Day
-REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Canada Day (observed)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 6] MSG Canada Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labour Day
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Canada Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 6] MSG Canada Day (observed)
+REM First Monday in September ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT 30 September MSG National Day for Truth and Reconciliation
-REM 1 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG National Day for Truth and Reconciliation (observed)
-REM 2 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 30)) == 6] MSG National Day for Truth and Reconciliation (observed)
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Thanksgiving Day
+REM 1 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG National Day for Truth and Reconciliation (observed)
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 6] MSG National Day for Truth and Reconciliation (observed)
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Thanksgiving Day
 OMIT 11 November MSG Remembrance Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Remembrance Day (observed)
-REM 13 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Remembrance Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Remembrance Day (observed)
+REM 13 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Remembrance Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)

include/holidays/ca/ab.rem

@@ -9,6 +9,8 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
+
+# Optional holidays
 REM [easterdate($Uy)+1] MSG Easter Monday
 REM First Monday in August SCANFROM -28 MSG Heritage Day

include/holidays/ca/bc.rem

@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG British Columbia Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG British Columbia Day

include/holidays/ca/mb.rem

@@ -9,5 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Louis Riel Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Louis Riel Day
+
+# Optional holidays
 REM First Monday in August SCANFROM -28 MSG Terry Fox Day

include/holidays/ca/nb.rem

@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG New Brunswick Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG New Brunswick Day

include/holidays/ca/nl.rem

@@ -10,6 +10,8 @@
 # also include [$SysInclude]/ca.rem
 
 OMIT 1 July MSG Memorial Day
+
+# Optional holidays
 REM Monday 14 March SCANFROM -28 MSG Saint Patrick's Day
 REM Monday 20 April SCANFROM -28 MSG Saint George's Day
 REM Monday 21 June SCANFROM -28 MSG Discovery Day

include/holidays/ca/ns.rem

@@ -9,5 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Heritage Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Heritage Day
+
+# Optional holidays
 REM First Monday in August SCANFROM -28 MSG Natal Day

include/holidays/ca/nt.rem

@@ -10,4 +10,4 @@
 # also include [$SysInclude]/ca.rem
 
 OMIT 21 June MSG National Aboriginal Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Civic Holiday
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Civic Holiday

include/holidays/ca/nu.rem

@@ -9,5 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Civic Holiday
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Civic Holiday
+
+# Optional holidays
 REM 9 July MSG Nunavut Day

include/holidays/ca/on.rem

@@ -9,5 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
+
+# Optional holidays
 REM First Monday in August SCANFROM -28 MSG Civic Holiday

include/holidays/ca/pe.rem

@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Islander Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Islander Day

include/holidays/ca/qc.rem

@@ -11,5 +11,7 @@
 
 REM Monday 18 May ADDOMIT SCANFROM -28 MSG National Patriots' Day
 OMIT 24 June MSG Saint Jean Baptiste Day
-REM 25 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 24)) == 0] MSG Saint Jean Baptiste Day (observed)
+REM 25 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 24)) == 0] MSG Saint Jean Baptiste Day (observed)
+
+# Optional holidays
 REM [easterdate($Uy)+1] MSG Easter Monday

include/holidays/ca/sk.rem

@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Saskatchewan Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Saskatchewan Day

include/holidays/ca/yt.rem

@@ -10,5 +10,7 @@
 # also include [$SysInclude]/ca.rem
 
 OMIT 21 June MSG National Aboriginal Day
-REM Third Monday in August SCANFROM -28 ADDOMIT MSG Discovery Day
+REM Third Monday in August ADDOMIT SCANFROM -28 MSG Discovery Day
+
+# Optional holidays
 REM Sunday 1 March --9 SCANFROM -28 MSG Heritage Day

include/holidays/ch.rem

@@ -10,7 +10,7 @@
 # one of the regional *.rem files in the directory
 # [$SysInclude]/ch/
 
-OMIT 1 January MSG Neujahrestag
+OMIT 1 January MSG Neujahr
 OMIT [easterdate($Uy)+39] MSG Auffahrt
 OMIT 1 August MSG Nationalfeiertag
 OMIT 25 December MSG Weihnachten

include/holidays/ch/ai.rem

@@ -16,4 +16,4 @@ OMIT [easterdate($Uy)+60] MSG Fronleichnam
 OMIT 15 August MSG Mariä Himmelfahrt
 OMIT 1 November MSG Allerheiligen
 OMIT 8 December MSG Mariä Empfängnis
-OMIT 26 December MSG Stephanstag
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 6] MSG Stephanstag

include/holidays/ch/ar.rem

@@ -12,4 +12,4 @@
 OMIT [easterdate($Uy)-2] MSG Karfreitag
 OMIT [easterdate($Uy)+1] MSG Ostermontag
 OMIT [easterdate($Uy)+50] MSG Pfingstmontag
-OMIT 26 December MSG Stephanstag
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 6] MSG Stephanstag

include/holidays/ch/fr.rem

@@ -10,6 +10,8 @@
 # also include [$SysInclude]/ch.rem
 
 OMIT [easterdate($Uy)-2] MSG Karfreitag
+
+# Optional holidays
 REM 2 January MSG Berchtoldstag
 REM [easterdate($Uy)+1] MSG Ostermontag
 REM [easterdate($Uy)+50] MSG Pfingstmontag

include/holidays/ch/gl.rem

@@ -9,9 +9,13 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ch.rem
 
+REM Thursday 1 April ADDOMIT SCANFROM -28 SATISFY [$T != easterdate($Ty)-3] MSG Näfelser Fahrt
+REM Thursday 8 April ADDOMIT SCANFROM -28 SATISFY [$T == easterdate($Ty)+4] MSG Näfelser Fahrt
 OMIT [easterdate($Uy)-2] MSG Karfreitag
 OMIT [easterdate($Uy)+1] MSG Ostermontag
 OMIT [easterdate($Uy)+50] MSG Pfingstmontag
 OMIT 1 November MSG Allerheiligen
 OMIT 26 December MSG Stephanstag
+
+# Optional holidays
 REM 2 January MSG Berchtoldstag

include/holidays/ch/gr.rem

@@ -12,4 +12,6 @@
 OMIT [easterdate($Uy)+1] MSG Ostermontag
 OMIT [easterdate($Uy)+50] MSG Pfingstmontag
 OMIT 26 December MSG Stephanstag
+
+# Optional holidays
 REM [easterdate($Uy)-2] MSG Karfreitag

include/holidays/ch/ne.rem

@@ -9,9 +9,9 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ch.rem
 
-OMIT 2 January MSG Berchtoldstag
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG Berchtoldstag
 OMIT 1 March MSG Jahrestag der Ausrufung der Republik
 OMIT [easterdate($Uy)-2] MSG Karfreitag
 OMIT 1 May MSG Tag der Arbeit
 OMIT [easterdate($Uy)+60] MSG Fronleichnam
-OMIT 26 December MSG Stephanstag
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG Stephanstag

include/holidays/ch/nw.rem

@@ -15,6 +15,8 @@ OMIT [easterdate($Uy)+60] MSG Fronleichnam
 OMIT 15 August MSG Mariä Himmelfahrt
 OMIT 1 November MSG Allerheiligen
 OMIT 8 December MSG Mariä Empfängnis
+
+# Optional holidays
 REM 2 January MSG Berchtoldstag
 REM [easterdate($Uy)+1] MSG Ostermontag
 REM [easterdate($Uy)+50] MSG Pfingstmontag

include/holidays/ch/ow.rem

@@ -15,6 +15,8 @@ OMIT 15 August MSG Mariä Himmelfahrt
 OMIT 25 September MSG Bruder Klaus
 OMIT 1 November MSG Allerheiligen
 OMIT 8 December MSG Mariä Empfängnis
+
+# Optional holidays
 REM 2 January MSG Berchtoldstag
 REM [easterdate($Uy)+1] MSG Ostermontag
 REM [easterdate($Uy)+50] MSG Pfingstmontag

include/holidays/ch/sg.rem

@@ -14,4 +14,6 @@ OMIT [easterdate($Uy)+1] MSG Ostermontag
 OMIT [easterdate($Uy)+50] MSG Pfingstmontag
 OMIT 1 November MSG Allerheiligen
 OMIT 26 December MSG Stephanstag
+
+# Optional holidays
 REM 2 January MSG Berchtoldstag

include/holidays/ch/sh.rem

@@ -14,4 +14,6 @@ OMIT [easterdate($Uy)+1] MSG Ostermontag
 OMIT 1 May MSG Tag der Arbeit
 OMIT [easterdate($Uy)+50] MSG Pfingstmontag
 OMIT 26 December MSG Stephanstag
+
+# Optional holidays
 REM 2 January MSG Berchtoldstag

include/holidays/ch/so.rem

@@ -10,5 +10,7 @@
 # also include [$SysInclude]/ch.rem
 
 OMIT [easterdate($Uy)-2] MSG Karfreitag
+
+# Optional holidays
 REM 2 January MSG Berchtoldstag
 REM 1 May MSG Tag der Arbeit

include/holidays/ch/ur.rem

@@ -18,4 +18,4 @@ OMIT [easterdate($Uy)+60] MSG Fronleichnam
 OMIT 15 August MSG Mariä Himmelfahrt
 OMIT 1 November MSG Allerheiligen
 OMIT 8 December MSG Mariä Empfängnis
-OMIT 26 December MSG Stephanstag
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 6] MSG Stephanstag

include/holidays/ch/vs.rem

@@ -14,6 +14,8 @@ OMIT [easterdate($Uy)+60] MSG Fronleichnam
 OMIT 15 August MSG Mariä Himmelfahrt
 OMIT 1 November MSG Allerheiligen
 OMIT 8 December MSG Mariä Empfängnis
+
+# Optional holidays
 REM 2 January MSG Berchtoldstag
 REM [easterdate($Uy)+1] MSG Ostermontag
 REM [easterdate($Uy)+50] MSG Pfingstmontag

include/holidays/ch/zg.rem

@@ -14,6 +14,8 @@ OMIT [easterdate($Uy)+60] MSG Fronleichnam
 OMIT 15 August MSG Mariä Himmelfahrt
 OMIT 1 November MSG Allerheiligen
 OMIT 8 December MSG Mariä Empfängnis
+
+# Optional holidays
 REM 2 January MSG Berchtoldstag
 REM [easterdate($Uy)+1] MSG Ostermontag
 REM [easterdate($Uy)+50] MSG Pfingstmontag

include/holidays/cl.rem

@@ -11,31 +11,34 @@
 # [$SysInclude]/cl/
 
 OMIT 1 January MSG Año Nuevo
-OMIT 2 January MSG Feriado nacional
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG Feriado nacional
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT [easterdate($Uy)-1] MSG Sábado Santo
 OMIT 1 May MSG Día Nacional del Trabajo
 OMIT 21 May MSG Día de las Glorias Navales
-REM 26 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 4] MSG San Pedro y San Pablo
-REM 27 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 3] MSG San Pedro y San Pablo
-REM 28 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 2] MSG San Pedro y San Pablo
-OMIT 29 June MSG San Pedro y San Pablo
-REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 5] MSG San Pedro y San Pablo
+REM [datepart(soleq(1, $U-28))] ADDOMIT MSG Día Nacional de los Pueblos Indígenas
+REM 26 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 4] MSG San Pedro y San Pablo
+REM 27 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 3] MSG San Pedro y San Pablo
+REM 28 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 2] MSG San Pedro y San Pablo
+REM 29 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG San Pedro y San Pablo
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 5] MSG San Pedro y San Pablo
 OMIT 16 July MSG Virgen del Carmen
 OMIT 15 August MSG Asunción de la Virgen
-OMIT 17 September MSG Fiestas Patrias
+REM 17 September ADDOMIT SCANFROM -28 SATISFY [$Tw == 1 || $Tw == 5] MSG Fiestas Patrias
 OMIT 18 September MSG Día de la Independencia
 OMIT 19 September MSG Día de las Glorias del Ejército
-OMIT 20 September MSG Fiestas Patrias
-REM 9 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Encuentro de dos Mundos
-REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Encuentro de dos Mundos
-REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Encuentro de dos Mundos
-OMIT 12 October MSG Día del Encuentro de dos Mundos
-REM 15 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Encuentro de dos Mundos
-REM 27 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 31)) == 2] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
-OMIT 31 October MSG Día Nacional de las Iglesias Evangélicas y Protestantes
+REM 20 September ADDOMIT SCANFROM -28 SATISFY [$Tw == 5] MSG Fiestas Patrias
+REM 9 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Encuentro de dos Mundos
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Encuentro de dos Mundos
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Encuentro de dos Mundos
+REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día del Encuentro de dos Mundos
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Encuentro de dos Mundos
+REM 27 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 31)) == 2] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
+REM 31 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
 OMIT 1 November MSG Día de Todos los Santos
-REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 31)) == 3] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 31)) == 3] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
 OMIT 8 December MSG La Inmaculada Concepción
 OMIT 25 December MSG Navidad
+
+# Optional holidays
 REM 31 December MSG Feriado bancario

include/holidays/co.rem

@@ -4,80 +4,80 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Año Nuevo
-OMIT 6 January MSG Día de los Reyes Magos
-REM 7 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 0] MSG Día de los Reyes Magos (observado)
-REM 8 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 6] MSG Día de los Reyes Magos (observado)
-REM 9 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 5] MSG Día de los Reyes Magos (observado)
-REM 10 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 4] MSG Día de los Reyes Magos (observado)
-REM 11 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 3] MSG Día de los Reyes Magos (observado)
-REM 12 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 2] MSG Día de los Reyes Magos (observado)
-OMIT 19 March MSG Día de San José
-REM 20 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 0] MSG Día de San José (observado)
-REM 21 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 6] MSG Día de San José (observado)
-REM 22 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 5] MSG Día de San José (observado)
-REM 23 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 4] MSG Día de San José (observado)
-REM 24 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 3] MSG Día de San José (observado)
-REM 25 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 2] MSG Día de San José (observado)
+REM 6 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de los Reyes Magos (observado)
+REM 7 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 0] MSG Día de los Reyes Magos (observado)
+REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 6] MSG Día de los Reyes Magos (observado)
+REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 5] MSG Día de los Reyes Magos (observado)
+REM 10 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 4] MSG Día de los Reyes Magos (observado)
+REM 11 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 3] MSG Día de los Reyes Magos (observado)
+REM 12 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 2] MSG Día de los Reyes Magos (observado)
+REM 19 March ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de San José (observado)
+REM 20 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 0] MSG Día de San José (observado)
+REM 21 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 6] MSG Día de San José (observado)
+REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 5] MSG Día de San José (observado)
+REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 4] MSG Día de San José (observado)
+REM 24 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 3] MSG Día de San José (observado)
+REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 2] MSG Día de San José (observado)
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT 1 May MSG Día del Trabajo
-REM 10 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 0] MSG Ascensión del señor (observado)
-REM 11 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 6] MSG Ascensión del señor (observado)
-REM 12 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 5] MSG Ascensión del señor (observado)
-REM 13 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 4] MSG Ascensión del señor (observado)
-REM 14 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 3] MSG Ascensión del señor (observado)
-REM 15 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 2] MSG Ascensión del señor (observado)
-OMIT [easterdate($Uy)+39] MSG Ascensión del señor
-REM 31 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 0] MSG Corpus Christi (observado)
-REM 1 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 6] MSG Corpus Christi (observado)
-REM 2 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 5] MSG Corpus Christi (observado)
-REM 3 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 4] MSG Corpus Christi (observado)
-REM 4 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 3] MSG Corpus Christi (observado)
-REM 5 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 2] MSG Corpus Christi (observado)
-REM 8 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 0] MSG Sagrado Corazón (observado)
-REM 9 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 6] MSG Sagrado Corazón (observado)
-REM 10 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 5] MSG Sagrado Corazón (observado)
-REM 11 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 4] MSG Sagrado Corazón (observado)
-REM 12 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 3] MSG Sagrado Corazón (observado)
-OMIT [easterdate($Uy)+60] MSG Corpus Christi
-REM 13 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 2] MSG Sagrado Corazón (observado)
-OMIT [easterdate($Uy)+68] MSG Sagrado Corazón
-OMIT 29 June MSG San Pedro y San Pablo
-REM 30 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 0] MSG San Pedro y San Pablo (observado)
-REM 1 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 6] MSG San Pedro y San Pablo (observado)
-REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 5] MSG San Pedro y San Pablo (observado)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 4] MSG San Pedro y San Pablo (observado)
-REM 4 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 3] MSG San Pedro y San Pablo (observado)
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 2] MSG San Pedro y San Pablo (observado)
+REM 9 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Ascensión del señor (observado)
+REM 10 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 0] MSG Ascensión del señor (observado)
+REM 11 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 6] MSG Ascensión del señor (observado)
+REM 12 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 5] MSG Ascensión del señor (observado)
+REM 13 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 4] MSG Ascensión del señor (observado)
+REM 14 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 3] MSG Ascensión del señor (observado)
+REM 15 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 2] MSG Ascensión del señor (observado)
+REM 30 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Corpus Christi (observado)
+REM 31 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 0] MSG Corpus Christi (observado)
+REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 6] MSG Corpus Christi (observado)
+REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 5] MSG Corpus Christi (observado)
+REM 3 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 4] MSG Corpus Christi (observado)
+REM 4 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 3] MSG Corpus Christi (observado)
+REM 5 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 2] MSG Corpus Christi (observado)
+REM 7 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Sagrado Corazón (observado)
+REM 8 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 0] MSG Sagrado Corazón (observado)
+REM 9 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 6] MSG Sagrado Corazón (observado)
+REM 10 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 5] MSG Sagrado Corazón (observado)
+REM 11 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 4] MSG Sagrado Corazón (observado)
+REM 12 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 3] MSG Sagrado Corazón (observado)
+REM 13 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 2] MSG Sagrado Corazón (observado)
+REM 29 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG San Pedro y San Pablo (observado)
+REM 30 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 0] MSG San Pedro y San Pablo (observado)
+REM 1 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 6] MSG San Pedro y San Pablo (observado)
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 5] MSG San Pedro y San Pablo (observado)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 4] MSG San Pedro y San Pablo (observado)
+REM 4 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 3] MSG San Pedro y San Pablo (observado)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 2] MSG San Pedro y San Pablo (observado)
 OMIT 20 July MSG Día de la Independencia
 OMIT 7 August MSG Batalla de Boyacá
-OMIT 15 August MSG La Asunción
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG La Asunción (observado)
-REM 17 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 6] MSG La Asunción (observado)
-REM 18 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 5] MSG La Asunción (observado)
-REM 19 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 4] MSG La Asunción (observado)
-REM 20 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 3] MSG La Asunción (observado)
-REM 21 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 2] MSG La Asunción (observado)
-OMIT 12 October MSG Día de la Raza
-REM 13 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Día de la Raza (observado)
-REM 14 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 6] MSG Día de la Raza (observado)
-REM 15 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día de la Raza (observado)
-REM 16 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día de la Raza (observado)
-REM 17 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día de la Raza (observado)
-REM 18 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día de la Raza (observado)
-OMIT 1 November MSG Día de Todos los Santos
-REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG Día de Todos los Santos (observado)
-REM 3 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 6] MSG Día de Todos los Santos (observado)
-REM 4 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 5] MSG Día de Todos los Santos (observado)
-REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 4] MSG Día de Todos los Santos (observado)
-REM 6 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 3] MSG Día de Todos los Santos (observado)
-REM 7 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 2] MSG Día de Todos los Santos (observado)
-OMIT 11 November MSG Independencia de Cartagena
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Independencia de Cartagena (observado)
-REM 13 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Independencia de Cartagena (observado)
-REM 14 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 5] MSG Independencia de Cartagena (observado)
-REM 15 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Independencia de Cartagena (observado)
-REM 16 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 3] MSG Independencia de Cartagena (observado)
-REM 17 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Independencia de Cartagena (observado)
+REM 15 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG La Asunción (observado)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG La Asunción (observado)
+REM 17 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 6] MSG La Asunción (observado)
+REM 18 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 5] MSG La Asunción (observado)
+REM 19 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 4] MSG La Asunción (observado)
+REM 20 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 3] MSG La Asunción (observado)
+REM 21 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 2] MSG La Asunción (observado)
+REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de la Raza (observado)
+REM 13 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Día de la Raza (observado)
+REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 6] MSG Día de la Raza (observado)
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día de la Raza (observado)
+REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día de la Raza (observado)
+REM 17 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día de la Raza (observado)
+REM 18 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día de la Raza (observado)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de Todos los Santos (observado)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG Día de Todos los Santos (observado)
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 6] MSG Día de Todos los Santos (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 5] MSG Día de Todos los Santos (observado)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 4] MSG Día de Todos los Santos (observado)
+REM 6 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 3] MSG Día de Todos los Santos (observado)
+REM 7 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 2] MSG Día de Todos los Santos (observado)
+REM 11 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Independencia de Cartagena (observado)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Independencia de Cartagena (observado)
+REM 13 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Independencia de Cartagena (observado)
+REM 14 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 5] MSG Independencia de Cartagena (observado)
+REM 15 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Independencia de Cartagena (observado)
+REM 16 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 3] MSG Independencia de Cartagena (observado)
+REM 17 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Independencia de Cartagena (observado)
 OMIT 8 December MSG La Inmaculada Concepción
 OMIT 25 December MSG Navidad

include/holidays/cr.rem

@@ -1,35 +1,37 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for CostaRica
+# Holiday file for Costa Rica
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Año Nuevo
-REM 9 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 3] MSG Día de Juan Santamaría (observado)
-REM 10 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 2] MSG Día de Juan Santamaría (observado)
-OMIT 11 April MSG Día de Juan Santamaría
+REM 9 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 3] MSG Día de Juan Santamaría (observado)
+REM 10 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 2] MSG Día de Juan Santamaría (observado)
+REM 11 April ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de Juan Santamaría (observado)
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-REM 12 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 0] MSG Día de Juan Santamaría (observado)
+REM 12 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 0] MSG Día de Juan Santamaría (observado)
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
-REM 13 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 6] MSG Día de Juan Santamaría (observado)
-REM 14 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 5] MSG Día de Juan Santamaría (observado)
-REM 15 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 4] MSG Día de Juan Santamaría (observado)
+REM 13 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 6] MSG Día de Juan Santamaría (observado)
+REM 14 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 5] MSG Día de Juan Santamaría (observado)
+REM 15 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 4] MSG Día de Juan Santamaría (observado)
 OMIT 1 May MSG Día Internacional del Trabajo
-REM 23 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 3] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-REM 24 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 2] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-OMIT 25 July MSG Anexión del Partido de Nicoya a Costa Rica
-REM 26 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 0] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-REM 27 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 6] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-REM 28 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 5] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-REM 29 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 4] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-REM 13 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 3] MSG Día de la Madre (observado)
-REM 14 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 2] MSG Día de la Madre (observado)
-OMIT 15 August MSG Día de la Madre
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Día de la Madre (observado)
-REM 17 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 6] MSG Día de la Madre (observado)
-REM 18 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 5] MSG Día de la Madre (observado)
-REM 19 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 4] MSG Día de la Madre (observado)
+REM 23 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 3] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 24 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 2] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 25 July ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 26 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 0] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 27 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 6] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 28 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 5] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 4] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 13 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 3] MSG Día de la Madre (observado)
+REM 14 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 2] MSG Día de la Madre (observado)
+REM 15 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de la Madre (observado)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Día de la Madre (observado)
+REM 17 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 6] MSG Día de la Madre (observado)
+REM 18 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 5] MSG Día de la Madre (observado)
+REM 19 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 4] MSG Día de la Madre (observado)
 OMIT 15 September MSG Día de la Independencia
 OMIT 25 December MSG Navidad
+
+# Optional holidays
 REM 2 August MSG Fiesta de Nuestra Señora de los Ángeles
 REM 31 August MSG Día de la Persona Negra y la Cultura Afrocostarricense
 REM 1 December MSG Día de la Abolición del Ejército

include/holidays/cu.rem

@@ -7,11 +7,11 @@ OMIT 1 January MSG Triunfo de la Revolución
 OMIT 2 January MSG Día de la Victoria
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT 1 May MSG Día Internacional de los Trabajadores
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día Internacional de los Trabajadores (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día Internacional de los Trabajadores (observado)
 OMIT 25 July MSG Conmemoración del asalto a Moncada
 OMIT 26 July MSG Día de la Rebeldía Nacional
 OMIT 27 July MSG Conmemoración del asalto a Moncada
 OMIT 10 October MSG Inicio de las Guerras de Independencia
-REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 10)) == 0] MSG Inicio de las Guerras de Independencia (observado)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 10)) == 0] MSG Inicio de las Guerras de Independencia (observado)
 OMIT 25 December MSG Día de Navidad
 OMIT 31 December MSG Fiesta de Fin de Año

include/holidays/cw.rem

@@ -8,9 +8,15 @@ OMIT [easterdate($Uy)-48] MSG Dialuna despues di Carnaval Grandi
 OMIT [easterdate($Uy)-2] MSG Bièrnèsantu
 OMIT [easterdate($Uy)] MSG Pasku di Resurekshon
 OMIT [easterdate($Uy)+1] MSG Di dos dia di Pasku di Resurekshon
+REM 27 April ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Dia di Rey
+REM 28 April ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG Dia di Rey
+REM 1 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Dia di Obrero
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG Dia di Obrero
 OMIT [easterdate($Uy)+39] MSG Dia di Asenshon
 OMIT 2 July MSG Dia di Himno i Bandera
 OMIT 10 October MSG Dia di Pais Kòrsou
 OMIT 25 December MSG Pasku di Nasementu
 OMIT 26 December MSG Di dos dia di Pasku di Nasementu
+
+# Optional holidays
 REM 31 December MSG Vispu di Aña Nobo

include/holidays/cy.rem

@@ -18,6 +18,8 @@ OMIT 1 October MSG Ημέρα της Κυπριακής Ανεξαρτησίας
 OMIT 28 October MSG Ημέρα του Όχι
 OMIT 25 December MSG Χριστούγεννα
 OMIT 26 December MSG Επομένη Χριστουγέννων
+
+# Optional holidays
 REM [easterdate($Uy)-1] MSG Μεγάλο Σάββατο
 REM [easterdate($Uy)+2] MSG Τρίτη της Διακαινησίμου
 REM 24 December MSG Παραμονή Χριστουγέννων

include/holidays/de/by.rem

@@ -12,4 +12,6 @@
 OMIT 6 January MSG Heilige Drei Könige
 OMIT [easterdate($Uy)+60] MSG Fronleichnam
 OMIT 1 November MSG Allerheiligen
+
+# Optional holidays
 REM 15 August MSG Mariä Himmelfahrt

include/holidays/dk.rem

@@ -13,6 +13,8 @@ OMIT [easterdate($Uy)+49] MSG Pinsedag
 OMIT [easterdate($Uy)+50] MSG Anden pinsedag
 OMIT 25 December MSG Juledag
 OMIT 26 December MSG Anden juledag
+
+# Optional holidays
 REM 1 May MSG Arbejdernes kampdag
 REM 5 June MSG Grundlovsdag
 REM 24 December MSG Juleaftensdag

include/holidays/dm.rem

@@ -4,19 +4,19 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-48] MSG Carnival Monday
 OMIT [easterdate($Uy)-47] MSG Carnival Tuesday
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM First Monday in May SCANFROM -28 ADDOMIT MSG Labour Day
+REM First Monday in May ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT [easterdate($Uy)+50] MSG Whit Monday
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Emancipation Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Emancipation Day
 OMIT 3 November MSG Independence Day
 OMIT 4 November MSG National Day of Community Service
-REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 3)) == 0] MSG Independence Day (observed)
-REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG National Day of Community Service (observed)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 0] MSG Independence Day (observed)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG National Day of Community Service (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)

include/holidays/do.rem

@@ -1,34 +1,34 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for DominicanRepublic
+# Holiday file for Dominican Republic
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Año Nuevo
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 3] MSG Día de los Santos Reyes
-REM 5 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 2] MSG Día de los Santos Reyes
-OMIT 6 January MSG Día de los Santos Reyes
-REM 9 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 5] MSG Día de los Santos Reyes
-REM 10 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 4] MSG Día de los Santos Reyes
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 3] MSG Día de los Santos Reyes
+REM 5 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 2] MSG Día de los Santos Reyes
+REM 6 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de los Santos Reyes
+REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 5] MSG Día de los Santos Reyes
+REM 10 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 4] MSG Día de los Santos Reyes
 OMIT 21 January MSG Día de la Altagracia
-REM 24 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 26)) == 3] MSG Día de Duarte
-REM 25 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 26)) == 2] MSG Día de Duarte
-OMIT 26 January MSG Día de Duarte
-REM 29 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 26)) == 5] MSG Día de Duarte
-REM 30 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 26)) == 4] MSG Día de Duarte
+REM 24 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 26)) == 3] MSG Día de Duarte
+REM 25 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 26)) == 2] MSG Día de Duarte
+REM 26 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de Duarte
+REM 29 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 26)) == 5] MSG Día de Duarte
+REM 30 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 26)) == 4] MSG Día de Duarte
 OMIT 27 February MSG Día de Independencia
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
-REM 29 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 3] MSG Día del Trabajo
-REM 30 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Día del Trabajo
-OMIT 1 May MSG Día del Trabajo
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo
-REM 4 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 5] MSG Día del Trabajo
-REM 5 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Día del Trabajo
+REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 3] MSG Día del Trabajo
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Día del Trabajo
+REM 1 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Día del Trabajo
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo
+REM 4 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 5] MSG Día del Trabajo
+REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Día del Trabajo
 OMIT [easterdate($Uy)+60] MSG Corpus Christi
 OMIT 16 August MSG Día de la Restauración
 OMIT 24 September MSG Día de las Mercedes
-REM 4 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 6)) == 3] MSG Día de la Constitución
-REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 6)) == 2] MSG Día de la Constitución
-OMIT 6 November MSG Día de la Constitución
-REM 9 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 6)) == 5] MSG Día de la Constitución
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 6)) == 4] MSG Día de la Constitución
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 6)) == 3] MSG Día de la Constitución
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 6)) == 2] MSG Día de la Constitución
+REM 6 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de la Constitución
+REM 9 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 6)) == 5] MSG Día de la Constitución
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 6)) == 4] MSG Día de la Constitución
 OMIT 25 December MSG Día de Navidad

include/holidays/ec.rem

@@ -4,43 +4,43 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Año Nuevo
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
 OMIT [easterdate($Uy)-48] MSG Carnaval
 OMIT [easterdate($Uy)-47] MSG Carnaval
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
-REM 30 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Día del Trabajo (observado)
-REM 30 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Día del Trabajo (observado)
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Día del Trabajo (observado)
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Día del Trabajo (observado)
 OMIT 1 May MSG Día del Trabajo
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Día del Trabajo (observado)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 3] MSG Día del Trabajo (observado)
-REM 23 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 24)) == 2] MSG Batalla de Pichincha (observado)
-REM 23 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 24)) == 6] MSG Batalla de Pichincha (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Día del Trabajo (observado)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 3] MSG Día del Trabajo (observado)
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 2] MSG Batalla de Pichincha (observado)
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 6] MSG Batalla de Pichincha (observado)
 OMIT 24 May MSG Batalla de Pichincha
-REM 25 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 24)) == 0] MSG Batalla de Pichincha (observado)
-REM 25 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 24)) == 4] MSG Batalla de Pichincha (observado)
-REM 26 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 24)) == 3] MSG Batalla de Pichincha (observado)
-REM 9 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 10)) == 2] MSG Primer Grito de Independencia (observado)
-REM 9 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 10)) == 6] MSG Primer Grito de Independencia (observado)
+REM 25 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 0] MSG Batalla de Pichincha (observado)
+REM 25 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 4] MSG Batalla de Pichincha (observado)
+REM 26 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 3] MSG Batalla de Pichincha (observado)
+REM 9 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 2] MSG Primer Grito de Independencia (observado)
+REM 9 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 6] MSG Primer Grito de Independencia (observado)
 OMIT 10 August MSG Primer Grito de Independencia
-REM 11 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 10)) == 0] MSG Primer Grito de Independencia (observado)
-REM 11 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 10)) == 4] MSG Primer Grito de Independencia (observado)
-REM 12 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 10)) == 3] MSG Primer Grito de Independencia (observado)
-REM 8 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 9)) == 2] MSG Independencia de Guayaquil (observado)
-REM 8 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 9)) == 6] MSG Independencia de Guayaquil (observado)
+REM 11 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 0] MSG Primer Grito de Independencia (observado)
+REM 11 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 4] MSG Primer Grito de Independencia (observado)
+REM 12 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 3] MSG Primer Grito de Independencia (observado)
+REM 8 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 2] MSG Independencia de Guayaquil (observado)
+REM 8 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 6] MSG Independencia de Guayaquil (observado)
 OMIT 9 October MSG Independencia de Guayaquil
-REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 9)) == 0] MSG Independencia de Guayaquil (observado)
-REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 9)) == 4] MSG Independencia de Guayaquil (observado)
-REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 9)) == 3] MSG Independencia de Guayaquil (observado)
-REM 1 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Día de los Difuntos (observado)
-REM 1 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 6] MSG Día de los Difuntos (observado)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 0] MSG Independencia de Guayaquil (observado)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 4] MSG Independencia de Guayaquil (observado)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 3] MSG Independencia de Guayaquil (observado)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Día de los Difuntos (observado)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 6] MSG Día de los Difuntos (observado)
 OMIT 2 November MSG Día de los Difuntos
 OMIT 3 November MSG Independencia de Cuenca
-REM 4 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 3] MSG Día de los Difuntos (observado)
-REM 4 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 3)) == 0] MSG Independencia de Cuenca (observado)
-REM 4 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 3)) == 4] MSG Independencia de Cuenca (observado)
-REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 3)) == 3] MSG Independencia de Cuenca (observado)
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Día de Navidad (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 3] MSG Día de los Difuntos (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 0] MSG Independencia de Cuenca (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 4] MSG Independencia de Cuenca (observado)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 3] MSG Independencia de Cuenca (observado)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Día de Navidad (observado)
 OMIT 25 December MSG Día de Navidad
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Día de Navidad (observado)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Año Nuevo (observado)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Día de Navidad (observado)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Año Nuevo (observado)

include/holidays/es/an.rem

@@ -9,8 +9,8 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/es.rem
 
-OMIT 28 February MSG Día de Andalucia
-REM 29 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 28)) == 0] MSG Lunes siguiente a Día de Andalucia
+REM 28 February ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Andalucia
+REM 29 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 28)) == 0] MSG Lunes siguiente a Día de Andalucia
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 8 December MSG Inmaculada Concepción
-REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción

include/holidays/es/ar.rem

@@ -10,7 +10,7 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 23 April MSG Día de San Jorge
-REM 24 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 23)) == 0] MSG Lunes siguiente a Día de San Jorge
-OMIT 8 December MSG Inmaculada Concepción
-REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 23 April ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de San Jorge
+REM 24 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 23)) == 0] MSG Lunes siguiente a Día de San Jorge
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción

include/holidays/es/as.rem

@@ -10,7 +10,7 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 8 September MSG Día de Asturias
-REM 9 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 8)) == 0] MSG Lunes siguiente a Día de Asturias
-OMIT 8 December MSG Inmaculada Concepción
-REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 8 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Asturias
+REM 9 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 8)) == 0] MSG Lunes siguiente a Día de Asturias
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción

include/holidays/es/cl.rem

@@ -10,7 +10,7 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 23 April MSG Fiesta de Castilla y León
-REM 24 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 23)) == 0] MSG Lunes siguiente a Fiesta de Castilla y León
-OMIT 8 December MSG Inmaculada Concepción
-REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 23 April ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Fiesta de Castilla y León
+REM 24 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 23)) == 0] MSG Lunes siguiente a Fiesta de Castilla y León
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción

include/holidays/es/cn.rem

@@ -10,5 +10,5 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 30 May MSG Día de Canarias
-REM 31 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 0] MSG Lunes siguiente a Día de Canarias
+REM 30 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Canarias
+REM 31 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 0] MSG Lunes siguiente a Día de Canarias

include/holidays/es/ex.rem

@@ -11,5 +11,5 @@
 
 OMIT [easterdate($Uy)-47] MSG Martes de Carnaval
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 8 December MSG Inmaculada Concepción
-REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción

include/holidays/es/mc.rem

@@ -9,8 +9,8 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/es.rem
 
-OMIT 19 March MSG San José
-REM 20 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 0] MSG Lunes siguiente a San José
+REM 19 March ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a San José
+REM 20 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 0] MSG Lunes siguiente a San José
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 8 December MSG Inmaculada Concepción
-REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción

include/holidays/es/md.rem

@@ -10,6 +10,6 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 2 May MSG Fiesta de la Comunidad de Madrid
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 2)) == 0] MSG Lunes siguiente a Fiesta de la Comunidad de Madrid
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Fiesta de la Comunidad de Madrid
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 2)) == 0] MSG Lunes siguiente a Fiesta de la Comunidad de Madrid
 OMIT 25 July MSG Santiago Apóstol

include/holidays/es/ml.rem

@@ -10,5 +10,5 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 8 December MSG Inmaculada Concepción
-REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción

include/holidays/es/ri.rem

@@ -11,5 +11,5 @@
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 OMIT [easterdate($Uy)+1] MSG Lunes de Pascua
-OMIT 9 June MSG Día de La Rioja
-REM 10 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 9)) == 0] MSG Lunes siguiente a Día de La Rioja
+REM 9 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de La Rioja
+REM 10 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 9)) == 0] MSG Lunes siguiente a Día de La Rioja

include/holidays/et.rem

@@ -3,10 +3,16 @@
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 
+REM 19 January ADDOMIT SCANFROM -28 SATISFY [!isleap($T)] MSG ጥምቀት
+REM 20 January ADDOMIT SCANFROM -28 SATISFY [isleap($T)] MSG ጥምቀት
 OMIT 2 March MSG አድዋ
 OMIT [easterdate($Uy)-2] MSG ስቅለት
 OMIT [easterdate($Uy)] MSG ፋሲካ
 OMIT 1 May MSG የሰራተኞች ቀን
 OMIT 5 May MSG የአርበኞች ቀን
 OMIT 28 May MSG ደርግ የወደቀበት ቀን
+REM 11 September ADDOMIT SCANFROM -28 SATISFY [!isleap($Ty+1)] MSG እንቁጣጣሽ
+REM 12 September ADDOMIT SCANFROM -28 SATISFY [isleap($Ty+1)] MSG እንቁጣጣሽ
+REM 27 September ADDOMIT SCANFROM -28 SATISFY [!isleap($Ty+1)] MSG መስቀል
+REM 28 September ADDOMIT SCANFROM -28 SATISFY [isleap($Ty+1)] MSG መስቀል
 OMIT 25 December MSG ገና

include/holidays/fi.rem

@@ -12,11 +12,14 @@ OMIT 1 May MSG Vappu
 OMIT [easterdate($Uy)+39] MSG Helatorstai
 OMIT [easterdate($Uy)+49] MSG Helluntaipäivä
 REM Friday 19 June ADDOMIT SCANFROM -28 MSG Juhannusaatto
+REM Saturday 20 June ADDOMIT SCANFROM -28 MSG Juhannuspäivä
 REM Saturday 31 October ADDOMIT SCANFROM -28 MSG Pyhäinpäivä
 OMIT 6 December MSG Itsenäisyyspäivä
 OMIT 24 December MSG Jouluaatto
 OMIT 25 December MSG Joulupäivä
 OMIT 26 December MSG Tapaninpäivä
+
+# Optional holidays
 REM 5 February MSG Runebergin päivä
 REM 28 February MSG Kalevalan päivä, suomalaisen kulttuurin päivä
 REM 19 March MSG Minna Canthin päivä, tasa-arvon päivä

include/holidays/gb.rem

@@ -1,24 +1,24 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for UnitedKingdom
+# Holiday file for United Kingdom
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
 # Note: This file consists only of the country-wide
-# holidays for UnitedKingdom.
+# holidays for United Kingdom.
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
 # [$SysInclude]/gb/
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
-REM First Monday in May SCANFROM -28 ADDOMIT MSG May Day
-REM Last Monday in May SCANFROM -28 ADDOMIT MSG Spring Bank Holiday
+REM First Monday in May ADDOMIT SCANFROM -28 MSG May Day
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Spring Bank Holiday
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)

include/holidays/gb/eng.rem

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for subdivision ENG in UnitedKingdom
+# Holiday file for subdivision ENG in United Kingdom
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
@@ -10,4 +10,4 @@
 # also include [$SysInclude]/gb.rem
 
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM Last Monday in August SCANFROM -28 ADDOMIT MSG Late Summer Bank Holiday
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday

include/holidays/gb/nir.rem

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for subdivision NIR in UnitedKingdom
+# Holiday file for subdivision NIR in United Kingdom
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
@@ -10,10 +10,10 @@
 # also include [$SysInclude]/gb.rem
 
 OMIT 17 March MSG Saint Patrick's Day
-REM 18 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 17)) == 0] MSG Saint Patrick's Day (observed)
-REM 19 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 17)) == 6] MSG Saint Patrick's Day (observed)
+REM 18 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 0] MSG Saint Patrick's Day (observed)
+REM 19 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 6] MSG Saint Patrick's Day (observed)
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 12 July MSG Battle of the Boyne
-REM 13 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 12)) == 0] MSG Battle of the Boyne (observed)
-REM 14 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 12)) == 6] MSG Battle of the Boyne (observed)
-REM Last Monday in August SCANFROM -28 ADDOMIT MSG Late Summer Bank Holiday
+REM 13 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 12)) == 0] MSG Battle of the Boyne (observed)
+REM 14 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 12)) == 6] MSG Battle of the Boyne (observed)
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday

include/holidays/gb/sct.rem

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for subdivision SCT in UnitedKingdom
+# Holiday file for subdivision SCT in United Kingdom
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
@@ -10,10 +10,10 @@
 # also include [$SysInclude]/gb.rem
 
 OMIT 2 January MSG New Year Holiday
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 1] MSG New Year Holiday (observed)
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year Holiday (observed)
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 6] MSG New Year Holiday (observed)
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Summer Bank Holiday
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 1] MSG New Year Holiday (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year Holiday (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 6] MSG New Year Holiday (observed)
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Summer Bank Holiday
 OMIT 30 November MSG Saint Andrew's Day
-REM 1 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Saint Andrew's Day (observed)
-REM 2 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 30)) == 6] MSG Saint Andrew's Day (observed)
+REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Saint Andrew's Day (observed)
+REM 2 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 6] MSG Saint Andrew's Day (observed)

include/holidays/gb/wls.rem

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for subdivision WLS in UnitedKingdom
+# Holiday file for subdivision WLS in United Kingdom
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
@@ -10,4 +10,4 @@
 # also include [$SysInclude]/gb.rem
 
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM Last Monday in August SCANFROM -28 ADDOMIT MSG Late Summer Bank Holiday
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday

include/holidays/gh.rem

@@ -4,29 +4,29 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT 7 January MSG Constitution Day
-REM 8 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Constitution Day (observed)
-REM 9 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 7)) == 6] MSG Constitution Day (observed)
+REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Constitution Day (observed)
+REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 7)) == 6] MSG Constitution Day (observed)
 OMIT 6 March MSG Independence Day
-REM 7 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 6)) == 0] MSG Independence Day (observed)
-REM 8 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 6)) == 6] MSG Independence Day (observed)
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 6)) == 0] MSG Independence Day (observed)
+REM 8 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 6)) == 6] MSG Independence Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG May Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG May Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG May Day (observed)
 OMIT 4 August MSG Founders' Day
-REM 5 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 4)) == 0] MSG Founders' Day (observed)
-REM 6 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 4)) == 6] MSG Founders' Day (observed)
+REM 5 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 4)) == 0] MSG Founders' Day (observed)
+REM 6 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 4)) == 6] MSG Founders' Day (observed)
 OMIT 21 September MSG Kwame Nkrumah Memorial Day
-REM 22 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Kwame Nkrumah Memorial Day (observed)
-REM 23 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 21)) == 6] MSG Kwame Nkrumah Memorial Day (observed)
-REM First Friday in December SCANFROM -28 ADDOMIT MSG Farmer's Day
+REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Kwame Nkrumah Memorial Day (observed)
+REM 23 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 21)) == 6] MSG Kwame Nkrumah Memorial Day (observed)
+REM First Friday in December ADDOMIT SCANFROM -28 MSG Farmer's Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)

include/holidays/gl.rem

@@ -14,6 +14,8 @@ OMIT [easterdate($Uy)+49] MSG Piinsip ullua
 OMIT [easterdate($Uy)+50] MSG Piinsip ulluisa aappaanni
 OMIT 25 December MSG Juulli
 OMIT 26 December MSG Juullip aappaa
+
+# Optional holidays
 REM 6 January MSG Mitaarneq
 REM 1 May MSG Sulisartut ulluat
 REM 21 June MSG Ullortuneq