summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-04-13 14:20:55 +0300
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-04-13 14:20:55 +0300
commit9ecd573a049f5f699d6913c14d14cea2fa53ad06 (patch)
tree81a4bcf87ed8c641061178be7094f8ef974c0411
parent4fcf0832ea5f1553115f7da1fe63a218239f5dcb (diff)
Text: Added a semibold Fira Sans font
-rw-r--r--CMakeLists.txt1
-rw-r--r--res/about/license.gmi2
-rw-r--r--[-rwxr-xr-x]res/fonts/FiraSans-Italic.ttfbin411640 -> 411640 bytes
-rw-r--r--[-rwxr-xr-x]res/fonts/FiraSans-Light.ttfbin397116 -> 397116 bytes
-rw-r--r--res/fonts/FiraSans-SemiBold.ttfbin0 -> 437824 bytes
-rw-r--r--src/ui/text.c6
-rw-r--r--src/ui/text.h2
7 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b89a89d..a95c925b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,7 @@ set (EMBED_RESOURCES
58 res/fonts/FiraSans-Italic.ttf 58 res/fonts/FiraSans-Italic.ttf
59 res/fonts/FiraSans-Light.ttf 59 res/fonts/FiraSans-Light.ttf
60 res/fonts/FiraSans-Regular.ttf 60 res/fonts/FiraSans-Regular.ttf
61 res/fonts/FiraSans-SemiBold.ttf
61 res/fonts/Literata-Regular-opsz=14.ttf 62 res/fonts/Literata-Regular-opsz=14.ttf
62 res/fonts/Literata-Bold-opsz=36.ttf 63 res/fonts/Literata-Bold-opsz=36.ttf
63 res/fonts/Literata-ExtraLight-opsz=18.ttf 64 res/fonts/Literata-ExtraLight-opsz=18.ttf
diff --git a/res/about/license.gmi b/res/about/license.gmi
index 8c00f5d2..087ce3cf 100644
--- a/res/about/license.gmi
+++ b/res/about/license.gmi
@@ -107,7 +107,7 @@ This application uses fonts licensed under the Open Font License.
107=> https://www.google.com/get/noto/#sans-arab Noto Sans Arabic 107=> https://www.google.com/get/noto/#sans-arab Noto Sans Arabic
108=> https://www.google.com/get/noto/help/cjk/ Noto Sans CJK (JP, SC) 108=> https://www.google.com/get/noto/help/cjk/ Noto Sans CJK (JP, SC)
109=> https://github.com/googlefonts/nunito/blob/master/OFL.txt Nunito 109=> https://github.com/googlefonts/nunito/blob/master/OFL.txt Nunito
110=> https://github.com/adobe-fonts/source-sans-pro/blob/release/LICENSE.md Source Sans Pro 110=> https://github.com/adobe-fonts/source-sans/blob/release/LICENSE.md Source Sans 3
111 111
112Additional fonts: 112Additional fonts:
113 113
diff --git a/res/fonts/FiraSans-Italic.ttf b/res/fonts/FiraSans-Italic.ttf
index f5e49144..f5e49144 100755..100644
--- a/res/fonts/FiraSans-Italic.ttf
+++ b/res/fonts/FiraSans-Italic.ttf
Binary files differ
diff --git a/res/fonts/FiraSans-Light.ttf b/res/fonts/FiraSans-Light.ttf
index 2ad0374b..2ad0374b 100755..100644
--- a/res/fonts/FiraSans-Light.ttf
+++ b/res/fonts/FiraSans-Light.ttf
Binary files differ
diff --git a/res/fonts/FiraSans-SemiBold.ttf b/res/fonts/FiraSans-SemiBold.ttf
new file mode 100644
index 00000000..821a43d7
--- /dev/null
+++ b/res/fonts/FiraSans-SemiBold.ttf
Binary files differ
diff --git a/src/ui/text.c b/src/ui/text.c
index 9232bce2..e0aafc33 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -233,7 +233,7 @@ static void initFonts_Text_(iText *d) {
233 float h123Scaling = 1.0f; /* glyph scaling (<=1.0), for increasing line spacing */ 233 float h123Scaling = 1.0f; /* glyph scaling (<=1.0), for increasing line spacing */
234 if (d->contentFont == firaSans_TextFont) { 234 if (d->contentFont == firaSans_TextFont) {
235 regularFont = &fontFiraSansRegular_Embedded; 235 regularFont = &fontFiraSansRegular_Embedded;
236 boldFont = &fontFiraSansBold_Embedded; 236 boldFont = &fontFiraSansSemiBold_Embedded;
237 lightFont = &fontFiraSansLight_Embedded; 237 lightFont = &fontFiraSansLight_Embedded;
238 italicFont = &fontFiraSansItalic_Embedded; 238 italicFont = &fontFiraSansItalic_Embedded;
239 scaling = italicScaling = lightScaling = 0.85f; 239 scaling = italicScaling = lightScaling = 0.85f;
@@ -251,7 +251,7 @@ static void initFonts_Text_(iText *d) {
251 italicFont = &fontLiterataLightItalicopsz10_Embedded; 251 italicFont = &fontLiterataLightItalicopsz10_Embedded;
252 lightFont = &fontLiterataExtraLightopsz18_Embedded; 252 lightFont = &fontLiterataExtraLightopsz18_Embedded;
253 } 253 }
254 else if (d->contentFont == sourceSansPro_TextFont) { 254 else if (d->contentFont == sourceSans3_TextFont) {
255 regularFont = &fontSourceSans3Regular_Embedded; 255 regularFont = &fontSourceSans3Regular_Embedded;
256 boldFont = &fontSourceSans3Semibold_Embedded; 256 boldFont = &fontSourceSans3Semibold_Embedded;
257 italicFont = &fontSourceSans3It_Embedded; 257 italicFont = &fontSourceSans3It_Embedded;
@@ -278,7 +278,7 @@ static void initFonts_Text_(iText *d) {
278 h12Font = &fontLiterataBoldopsz36_Embedded; 278 h12Font = &fontLiterataBoldopsz36_Embedded;
279 h3Font = &fontLiterataRegularopsz14_Embedded; 279 h3Font = &fontLiterataRegularopsz14_Embedded;
280 } 280 }
281 else if (d->headingFont == sourceSansPro_TextFont) { 281 else if (d->headingFont == sourceSans3_TextFont) {
282 h12Font = &fontSourceSans3Bold_Embedded; 282 h12Font = &fontSourceSans3Bold_Embedded;
283 h3Font = &fontSourceSans3Regular_Embedded; 283 h3Font = &fontSourceSans3Regular_Embedded;
284 } 284 }
diff --git a/src/ui/text.h b/src/ui/text.h
index 1ae92890..c6091599 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -115,7 +115,7 @@ enum iTextFont {
115 firaSans_TextFont, 115 firaSans_TextFont,
116 literata_TextFont, 116 literata_TextFont,
117 tinos_TextFont, 117 tinos_TextFont,
118 sourceSansPro_TextFont, 118 sourceSans3_TextFont,
119 iosevka_TextFont, 119 iosevka_TextFont,
120}; 120};
121 121