From e1ff869f9f9249b90be26b10f604c8b2a57ab40b Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 5 Dec 2014 22:29:34 +0100 Subject: [PATCH 2/2] Improve the computation of the Dutch Queen's and King's days --- src/hd-data1.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/hd-data1.c b/src/hd-data1.c index ae7c9eb..56c26a7 100644 --- a/src/hd-data1.c +++ b/src/hd-data1.c @@ -1492,7 +1492,7 @@ nl_hdy (init_data, detected, easter, year, hd_elems, fday, count) const int fday; const int count; /*! - Manages all specific holidays celebrated in Netherlands. + Manages all specific holidays celebrated in the Netherlands. */ { register int day; @@ -1529,8 +1529,15 @@ nl_hdy (init_data, detected, easter, year, hd_elems, fday, count) holiday (*init_data, detected, _(hd_text[HD_ST_NICHOLAS_DAY].ht_text), ptr_cc_id, DIS_HLS_PREF, 5, MONTH_MAX, year, hd_elems, fday, count); - holiday (*init_data, detected, _(hd_text[HD_THE_QUEENS_BIRTHDAY].ht_text), - ptr_cc_id, "+", dvec[4 - 1], 4, year, hd_elems, fday, count); + if (year > 1890 && year < 1949) + holiday (*init_data, detected, _(hd_text[HD_THE_QUEENS_BIRTHDAY].ht_text), + ptr_cc_id, "+", 31, 8, year, hd_elems, fday, count); + else if (year > 1948 && year < 2014) + holiday (*init_data, detected, _(hd_text[HD_THE_QUEENS_BIRTHDAY].ht_text), + ptr_cc_id, "+", 30, 4, year, hd_elems, fday, count); + else if (year > 2013) + holiday (*init_data, detected, _(hd_text[HD_THE_KINGS_BIRTHDAY].ht_text), + ptr_cc_id, "+", 27, 4, year, hd_elems, fday, count); holiday (*init_data, detected, _(hd_text[HD_REMEMBRANCE_DAY].ht_text), ptr_cc_id, DIS_HLS_PREF, 4, 5, year, hd_elems, fday, count); holiday (*init_data, detected, _(hd_text[HD_SYLVESTER].ht_text), ptr_cc_id, -- 1.7.0.4