From 488dcbf40df6bf80b1042d5234b60ee2973b2818 Mon Sep 17 00:00:00 2001
From: Jaakko Keränen <jaakko.keranen@iki.fi>
Date: Tue, 13 Apr 2021 13:50:28 +0300
Subject: Updated the UI fonts to Source Sans 3

A new version of the typeface, now with all font variations needed
for page content as well.
---
 src/ui/text.c | 31 +++++++++++++++----------------
 src/ui/util.c |  4 ++--
 2 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/text.c b/src/ui/text.c
index bb446440..9232bce2 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -252,11 +252,10 @@ static void initFonts_Text_(iText *d) {
         lightFont   = &fontLiterataExtraLightopsz18_Embedded;
     }
     else if (d->contentFont == sourceSansPro_TextFont) {
-        regularFont = &fontSourceSansProRegular_Embedded;
-        boldFont    = &fontSourceSansProBold_Embedded;
-        italicFont  = &fontFiraSansItalic_Embedded;
-        lightFont   = &fontFiraSansLight_Embedded;
-        lightScaling = italicScaling = 0.85f;
+        regularFont = &fontSourceSans3Regular_Embedded;
+        boldFont    = &fontSourceSans3Semibold_Embedded;
+        italicFont  = &fontSourceSans3It_Embedded;
+        lightFont   = &fontSourceSans3ExtraLight_Embedded;
     }
     else if (d->contentFont == iosevka_TextFont) {
         regularFont = &fontIosevkaTermExtended_Embedded;
@@ -280,8 +279,8 @@ static void initFonts_Text_(iText *d) {
         h3Font  = &fontLiterataRegularopsz14_Embedded;
     }
     else if (d->headingFont == sourceSansPro_TextFont) {
-        h12Font = &fontSourceSansProBold_Embedded;
-        h3Font = &fontSourceSansProRegular_Embedded;
+        h12Font = &fontSourceSans3Bold_Embedded;
+        h3Font = &fontSourceSans3Regular_Embedded;
     }
     else if (d->headingFont == iosevka_TextFont) {
         h12Font = &fontIosevkaTermExtended_Embedded;
@@ -301,15 +300,15 @@ static void initFonts_Text_(iText *d) {
         /* Content sizes: smallmono, mono, 1.0, 1.2, 1.333, 1.666, 2.0 */
     } fontData[max_FontId] = {
         /* UI fonts: normal weight */
-        { &fontSourceSansProRegular_Embedded, uiSize,               1.0f, uiNormal_FontSize },
-        { &fontSourceSansProRegular_Embedded, uiSize * 1.125f,      1.0f, uiMedium_FontSize },
-        { &fontSourceSansProRegular_Embedded, uiSize * 1.333f,      1.0f, uiBig_FontSize },
-        { &fontSourceSansProRegular_Embedded, uiSize * 1.666f,      1.0f, uiLarge_FontSize },
+        { &fontSourceSans3Regular_Embedded, uiSize,               1.0f, uiNormal_FontSize },
+        { &fontSourceSans3Regular_Embedded, uiSize * 1.125f,      1.0f, uiMedium_FontSize },
+        { &fontSourceSans3Regular_Embedded, uiSize * 1.333f,      1.0f, uiBig_FontSize },
+        { &fontSourceSans3Regular_Embedded, uiSize * 1.666f,      1.0f, uiLarge_FontSize },
         /* UI fonts: bold weight */
-        { &fontSourceSansProBold_Embedded,    uiSize,               1.0f, uiNormal_FontSize },
-        { &fontSourceSansProBold_Embedded,    uiSize * 1.125f,      1.0f, uiMedium_FontSize },
-        { &fontSourceSansProBold_Embedded,    uiSize * 1.333f,      1.0f, uiBig_FontSize },
-        { &fontSourceSansProBold_Embedded,    uiSize * 1.666f,      1.0f, uiLarge_FontSize },
+        { &fontSourceSans3Bold_Embedded,    uiSize,               1.0f, uiNormal_FontSize },
+        { &fontSourceSans3Bold_Embedded,    uiSize * 1.125f,      1.0f, uiMedium_FontSize },
+        { &fontSourceSans3Bold_Embedded,    uiSize * 1.333f,      1.0f, uiBig_FontSize },
+        { &fontSourceSans3Bold_Embedded,    uiSize * 1.666f,      1.0f, uiLarge_FontSize },
         /* content fonts */
         { regularFont,                        textSize,             scaling,      contentRegular_FontSize },
         { boldFont,                           textSize,             scaling,      contentRegular_FontSize },
@@ -322,7 +321,7 @@ static void initFonts_Text_(iText *d) {
         { &fontIosevkaTermExtended_Embedded,  smallMonoSize,        1.0f,         contentMonoSmall_FontSize },
         { &fontIosevkaTermExtended_Embedded,  monoSize,             1.0f,         contentMono_FontSize },
         /* extra content fonts */
-        { &fontSourceSansProRegular_Embedded, textSize,             scaling, contentRegular_FontSize },
+        { &fontSourceSans3Regular_Embedded, textSize,             scaling, contentRegular_FontSize },
         { &fontIosevkaTermExtended_Embedded,  textSize,             0.866f,  contentRegular_FontSize },
         /* symbols and scripts */
 #define DEFINE_FONT_SET(data) \
diff --git a/src/ui/util.c b/src/ui/util.c
index f430ac1c..e410ded1 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1902,14 +1902,14 @@ static void addRadioButton_(iWidget *parent, const char *id, const char *label,
 
 static void addFontButtons_(iWidget *parent, const char *id) {
     const char *fontNames[] = {
-        "Nunito", "Fira Sans", "Literata", "Tinos", "Source Sans Pro", "Iosevka"
+        "Nunito", "Fira Sans", "Literata", "Tinos", "Source Sans 3", "Iosevka"
     };
     iArray *items = new_Array(sizeof(iMenuItem));
     iForIndices(i, fontNames) {
         pushBack_Array(items,
                        &(iMenuItem){ fontNames[i], 0, 0, format_CStr("!%s.set arg:%d", id, i) });
     }
-    iLabelWidget *button = makeMenuButton_LabelWidget("Source Sans Pro", data_Array(items), size_Array(items));
+    iLabelWidget *button = makeMenuButton_LabelWidget("Source Sans 3", data_Array(items), size_Array(items));
     setBackgroundColor_Widget(findChild_Widget(as_Widget(button), "menu"), uiBackgroundMenu_ColorId);
     setId_Widget(as_Widget(button), format_CStr("prefs.%s", id));
     addChildFlags_Widget(parent, iClob(button), alignLeft_WidgetFlag);
-- 
cgit v1.2.3