A few corrections from an updated conversion script from the Python library.

This commit is contained in:
Dianne Skoll
2024-11-10 10:18:43 -05:00
parent 4eafaaefeb
commit c8c2d5d32e
8 changed files with 12 additions and 10 deletions

View File

@@ -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

View File

@@ -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 SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 6] MSG [Stephanstag]

View File

@@ -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 SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 6] MSG [Stephanstag]

View File

@@ -9,6 +9,8 @@
# 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

View File

@@ -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 SCANFROM -28 ADDOMIT 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 SCANFROM -28 ADDOMIT SATISFY [$Tw == 1] MSG Stephanstag

View File

@@ -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 SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 6] MSG [Stephanstag]

View File

@@ -11,7 +11,7 @@
# [$SysInclude]/cl/
OMIT 1 January MSG Año Nuevo
OMIT 2 January MSG Feriado nacional
REM 2 January SCANFROM -28 ADDOMIT 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
@@ -23,10 +23,10 @@ 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
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 SCANFROM -28 ADDOMIT 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 20 September SCANFROM -28 ADDOMIT SATISFY [$Tw == 5] 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

View File

@@ -8,7 +8,7 @@ REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty
OMIT [easterdate($Uy)-2] MSG Good Friday
OMIT [easterdate($Uy)+1] MSG Easter Monday
REM First Monday in May SCANFROM -28 ADDOMIT MSG May Bank Holiday
OMIT 9 May MSG Liberation Day
REM 9 May SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG [Liberation Day (substitute day)]
REM Last Monday in May SCANFROM -28 ADDOMIT MSG Spring Bank Holiday
REM Last Monday in August SCANFROM -28 ADDOMIT MSG Summer Bank Holiday
OMIT 25 December MSG Christmas Day