diff --git a/Inky-Calendar/fonts/NotoSans/NotoSans-SemiCondensedExtraLight.ttf b/Inky-Calendar/fonts/NotoSans/NotoSans-SemiCondensedExtraLight.ttf deleted file mode 100644 index 05db9fd..0000000 Binary files a/Inky-Calendar/fonts/NotoSans/NotoSans-SemiCondensedExtraLight.ttf and /dev/null differ diff --git a/Inky-Calendar/fonts/NotoSans/NotoSans-SemiCondensedLight.ttf b/Inky-Calendar/fonts/NotoSans/NotoSans-SemiCondensedLight.ttf deleted file mode 100644 index e175b03..0000000 Binary files a/Inky-Calendar/fonts/NotoSans/NotoSans-SemiCondensedLight.ttf and /dev/null differ diff --git a/Inky-Calendar/fonts/NotoSans/NotoSans-SemiCondensedThin.ttf b/Inky-Calendar/fonts/NotoSans/NotoSans-SemiCondensedThin.ttf deleted file mode 100644 index 74cb50c..0000000 Binary files a/Inky-Calendar/fonts/NotoSans/NotoSans-SemiCondensedThin.ttf and /dev/null differ diff --git a/Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-Light.otf b/Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-Bold.otf similarity index 65% rename from Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-Light.otf rename to Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-Bold.otf index cb814c3..13314c9 100644 Binary files a/Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-Light.otf and b/Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-Bold.otf differ diff --git a/Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-DemiLight.otf b/Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-Medium.otf similarity index 66% rename from Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-DemiLight.otf rename to Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-Medium.otf index 34a739b..d0a58e1 100644 Binary files a/Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-DemiLight.otf and b/Inky-Calendar/fonts/NotoSansCJK/NotoSansCJKsc-Medium.otf differ diff --git a/Inky-Calendar/modules/inkycal_weather.py b/Inky-Calendar/modules/inkycal_weather.py index cf24141..a2b6489 100644 --- a/Inky-Calendar/modules/inkycal_weather.py +++ b/Inky-Calendar/modules/inkycal_weather.py @@ -152,7 +152,7 @@ def to_hours(datetime_object, simple = False): """Choose font optimised for the weather section""" fontsize = 8 -font = ImageFont.truetype(NotoSans+'.ttf', fontsize) +font = ImageFont.truetype(NotoSans+'Medium.ttf', fontsize) fill_height = 0.8 while font.getsize('hg')[1] <= (row_height * fill_height): diff --git a/Inky-Calendar/settings/configuration.py b/Inky-Calendar/settings/configuration.py index 338cd4e..c580e41 100644 --- a/Inky-Calendar/settings/configuration.py +++ b/Inky-Calendar/settings/configuration.py @@ -53,16 +53,14 @@ weatherfont = fontpath+'WeatherFont/weathericons-regular-webfont.ttf' """Automatically select correct fonts to support set language""" if language in ['ja','zh','zh_tw','ko']: - default = ImageFont.truetype(NotoSansCJK+'Light.otf', 18) - semi = ImageFont.truetype(NotoSansCJK+'DemiLight.otf', 18) - bold = ImageFont.truetype(NotoSansCJK+'Regular.otf', 18) - month_font = ImageFont.truetype(NotoSansCJK+'DemiLight.otf', 40) + default = ImageFont.truetype(NotoSansCJK+'Regular.otf', 18) + semi = ImageFont.truetype(NotoSansCJK+'Medium.otf', 18) + bold = ImageFont.truetype(NotoSansCJK+'Bold.otf', 18) else: - default = ImageFont.truetype(NotoSans+'Light.ttf', 18) - semi = ImageFont.truetype(NotoSans+'.ttf', 18) - bold = ImageFont.truetype(NotoSans+'Medium.ttf', 18) - month_font = ImageFont.truetype(NotoSans+'Light.ttf', 40) - + default = ImageFont.truetype(NotoSans+'.ttf', 18) + semi = ImageFont.truetype(NotoSans+'Medium.ttf', 18) + bold = ImageFont.truetype(NotoSans+'SemiBold.ttf', 18) + w_font = ImageFont.truetype(weatherfont, 10) """Create image with given parameters"""