From 636a85dea231227983612f1a8de6485c59dfb7d6 Mon Sep 17 00:00:00 2001 From: George Tzoumas Date: Sun, 31 Dec 2017 13:04:10 +0100 Subject: [PATCH] update french school holidays (2018) fix footer font render measure --- holidays/french_holidays_zone_A.FR.dat | 3 +++ holidays/french_holidays_zone_B.FR.dat | 3 +++ holidays/french_holidays_zone_C.FR.dat | 3 +++ layouts/_base.py | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/holidays/french_holidays_zone_A.FR.dat b/holidays/french_holidays_zone_A.FR.dat index ee6e58b..eeadf70 100644 --- a/holidays/french_holidays_zone_A.FR.dat +++ b/holidays/french_holidays_zone_A.FR.dat @@ -27,3 +27,6 @@ d|20160409-20160424|vacances de printemps||multi d|20170218-20170305|vacances d'hiver||multi d|20170415-20170501|vacances de printemps||multi + +d|20180212-20180223|vacances d'hiver||multi +d|20180409-20180420|vacances de printemps||multi diff --git a/holidays/french_holidays_zone_B.FR.dat b/holidays/french_holidays_zone_B.FR.dat index dd73476..5007391 100644 --- a/holidays/french_holidays_zone_B.FR.dat +++ b/holidays/french_holidays_zone_B.FR.dat @@ -27,3 +27,6 @@ d|20160402-20160417|vacances de printemps||multi d|20170211-20170226|vacances d'hiver||multi d|20170408-20170423|vacances de printemps||multi + +d|20180226-20180309|vacances d'hiver||multi +d|20180423-20180504|vacances de printemps||multi diff --git a/holidays/french_holidays_zone_C.FR.dat b/holidays/french_holidays_zone_C.FR.dat index a71003d..6e400d7 100644 --- a/holidays/french_holidays_zone_C.FR.dat +++ b/holidays/french_holidays_zone_C.FR.dat @@ -27,3 +27,6 @@ d|20160416-20160501|vacances de printemps||multi d|20170204-20170219|vacances d'hiver||multi d|20170401-20170417|vacances de printemps||multi + +d|20180219-20180302|vacances d'hiver||multi +d|20180416-20180427|vacances de printemps||multi diff --git a/layouts/_base.py b/layouts/_base.py index 5d0173a..6135f18 100644 --- a/layouts/_base.py +++ b/layouts/_base.py @@ -119,7 +119,7 @@ class DayCell(object): if self.footer: R = rect_rel_scale(rect, G.footer_size[0], G.footer_size[1], 0, 1.0 - G.footer_align) draw_str(cr, text = self.footer, rect = R, scaling = -1, stroke_rgba = S.footer, - font = S.footer_font) + font = S.footer_font, measure = "MgMgMg") def _draw_long(self, cr, rect): """render the day cell in long mode"""