Replaced EB Garamond with Tinos

Tinos is a much more readable serif font, especially when it comes to the italic variant.

13 files changed, 34 insertions, 124 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35e7707f..1b52f242 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,9 +57,9 @@ set (EMBED_RESOURCES
     res/about/lagrange.gmi
     res/about/license.gmi
     res/about/version.gmi
-    res/fonts/EBGaramond-Regular.ttf
-    res/fonts/EBGaramond-Italic.ttf
-    res/fonts/EBGaramond-Bold.ttf
+    res/fonts/Tinos-Regular.ttf
+    res/fonts/Tinos-Italic.ttf
+    res/fonts/Tinos-Bold.ttf
     res/fonts/FiraMono-Regular.ttf
     res/fonts/FiraSans-Bold.ttf
     res/fonts/FiraSans-Italic.ttf
diff --git a/res/about/help.gmi b/res/about/help.gmi
index f0495c2c..af3b06be 100644
--- a/res/about/help.gmi
+++ b/res/about/help.gmi
@@ -215,7 +215,7 @@ There are two sans-serif and two serif fonts:
 * "Nunito" is a friendly rounded sans-serif font.
 * "Fira Sans" is a bolder, narrower, and more angular sans-serif font.
 * "Literata" is a heavy and serious serif font.
-* "EB Garamond" is a lighter and more decorative serif font. You may find it more readable on light backgrounds.
+* "Tinos" is a lighter serif font.
 
 Other style options:
 
diff --git a/res/about/license.gmi b/res/about/license.gmi
index 96ca4ddd..0ea0897a 100644
--- a/res/about/license.gmi
+++ b/res/about/license.gmi
@@ -100,7 +100,6 @@ The libunistring library is covered by the GNU Lesser General Public License (LG
 
 This application uses fonts licensed under the Open Font License.
 
-=> https://fonts.google.com/specimen/EB+Garamond#license  EB Garamond
 => https://github.com/mozilla/Fira/blob/master/LICENSE  Fira Sans, Fira Mono
 => https://github.com/googlefonts/literata/blob/master/OFL.txt  Literata
 => https://github.com/google/fonts/blob/master/ofl/nanumgothic/OFL.txt  Nanum Gothic
@@ -112,3 +111,4 @@ Additional fonts:
 
 => https://github.com/googlefonts/noto-emoji/blob/master/LICENSE  Noto Emoji (Apache License 2.0)
 => https://dn-works.com/ufas/  Symbola (Public Domain)
+=> https://fonts.google.com/specimen/Tinos#license  Tinos (Apache License 2.0)
diff --git a/res/fonts/EBGaramond-Bold.ttf b/res/fonts/EBGaramond-Bold.ttf
deleted file mode 100644
index f380a1c3..00000000
--- a/res/fonts/EBGaramond-Bold.ttf
+++ /dev/null
diff --git a/res/fonts/EBGaramond-Italic.ttf b/res/fonts/EBGaramond-Italic.ttf
deleted file mode 100644
index a7201b00..00000000
--- a/res/fonts/EBGaramond-Italic.ttf
+++ /dev/null
diff --git a/res/fonts/EBGaramond-Regular.ttf b/res/fonts/EBGaramond-Regular.ttf
deleted file mode 100644
index f57146c9..00000000
--- a/res/fonts/EBGaramond-Regular.ttf
+++ /dev/null
diff --git a/res/fonts/LICENSE_EBGaramond.txt b/res/fonts/LICENSE_EBGaramond.txt
deleted file mode 100644
index 1fb3e844..00000000
--- a/res/fonts/LICENSE_EBGaramond.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2017 The EB Garamond Project Authors (https://github.com/octaviopardo/EBGaramond12)

-

-This Font Software is licensed under the SIL Open Font License, Version 1.1.

-This license is copied below, and is also available with a FAQ at:

-http://scripts.sil.org/OFL

-

-

------------------------------------------------------------

-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007

------------------------------------------------------------

-

-PREAMBLE

-The goals of the Open Font License (OFL) are to stimulate worldwide

-development of collaborative font projects, to support the font creation

-efforts of academic and linguistic communities, and to provide a free and

-open framework in which fonts may be shared and improved in partnership

-with others.

-

-The OFL allows the licensed fonts to be used, studied, modified and

-redistributed freely as long as they are not sold by themselves. The

-fonts, including any derivative works, can be bundled, embedded, 

-redistributed and/or sold with any software provided that any reserved

-names are not used by derivative works. The fonts and derivatives,

-however, cannot be released under any other type of license. The

-requirement for fonts to remain under this license does not apply

-to any document created using the fonts or their derivatives.

-

-DEFINITIONS

-"Font Software" refers to the set of files released by the Copyright

-Holder(s) under this license and clearly marked as such. This may

-include source files, build scripts and documentation.

-

-"Reserved Font Name" refers to any names specified as such after the

-copyright statement(s).

-

-"Original Version" refers to the collection of Font Software components as

-distributed by the Copyright Holder(s).

-

-"Modified Version" refers to any derivative made by adding to, deleting,

-or substituting -- in part or in whole -- any of the components of the

-Original Version, by changing formats or by porting the Font Software to a

-new environment.

-

-"Author" refers to any designer, engineer, programmer, technical

-writer or other person who contributed to the Font Software.

-

-PERMISSION & CONDITIONS

-Permission is hereby granted, free of charge, to any person obtaining

-a copy of the Font Software, to use, study, copy, merge, embed, modify,

-redistribute, and sell modified and unmodified copies of the Font

-Software, subject to the following conditions:

-

-1) Neither the Font Software nor any of its individual components,

-in Original or Modified Versions, may be sold by itself.

-

-2) Original or Modified Versions of the Font Software may be bundled,

-redistributed and/or sold with any software, provided that each copy

-contains the above copyright notice and this license. These can be

-included either as stand-alone text files, human-readable headers or

-in the appropriate machine-readable metadata fields within text or

-binary files as long as those fields can be easily viewed by the user.

-

-3) No Modified Version of the Font Software may use the Reserved Font

-Name(s) unless explicit written permission is granted by the corresponding

-Copyright Holder. This restriction only applies to the primary font name as

-presented to the users.

-

-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font

-Software shall not be used to promote, endorse or advertise any

-Modified Version, except to acknowledge the contribution(s) of the

-Copyright Holder(s) and the Author(s) or with their explicit written

-permission.

-

-5) The Font Software, modified or unmodified, in part or in whole,

-must be distributed entirely under this license, and must not be

-distributed under any other license. The requirement for fonts to

-remain under this license does not apply to any document created

-using the Font Software.

-

-TERMINATION

-This license becomes null and void if any of the above conditions are

-not met.

-

-DISCLAIMER

-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE

-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL

-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM

-OTHER DEALINGS IN THE FONT SOFTWARE.

diff --git a/res/fonts/Tinos-Bold.ttf b/res/fonts/Tinos-Bold.ttf
new file mode 100644
index 00000000..8b850691
--- /dev/null
+++ b/res/fonts/Tinos-Bold.ttf
diff --git a/res/fonts/Tinos-Italic.ttf b/res/fonts/Tinos-Italic.ttf
new file mode 100644
index 00000000..54b1f4d5
--- /dev/null
+++ b/res/fonts/Tinos-Italic.ttf
diff --git a/res/fonts/Tinos-Regular.ttf b/res/fonts/Tinos-Regular.ttf
new file mode 100644
index 00000000..823f7273
--- /dev/null
+++ b/res/fonts/Tinos-Regular.ttf
diff --git a/src/ui/text.c b/src/ui/text.c
index 8b3badb4..c241c66b 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -165,23 +165,25 @@ static iText text_;
 static void initFonts_Text_(iText *d) {
     const float textSize = fontSize_UI * d->contentFontSize;
     const float monoSize = fontSize_UI * d->contentFontSize / contentScale_Text_ * 0.866f;
-    const iBlock *regularFont = &fontNunitoRegular_Embedded;
-    const iBlock *italicFont  = &fontNunitoLightItalic_Embedded;
-    const iBlock *h12Font     = &fontNunitoExtraBold_Embedded;
-    const iBlock *h3Font      = &fontNunitoRegular_Embedded;
-    const iBlock *lightFont   = &fontNunitoExtraLight_Embedded;
-    float         scaling     = 1.0f; /* glyph scaling (<=1.0), for increasing line spacing */
-    float         h123Scaling = 1.0f; /* glyph scaling (<=1.0), for increasing line spacing */
+    const iBlock *regularFont  = &fontNunitoRegular_Embedded;
+    const iBlock *italicFont   = &fontNunitoLightItalic_Embedded;
+    const iBlock *h12Font      = &fontNunitoExtraBold_Embedded;
+    const iBlock *h3Font       = &fontNunitoRegular_Embedded;
+    const iBlock *lightFont    = &fontNunitoExtraLight_Embedded;
+    float         scaling      = 1.0f; /* glyph scaling (<=1.0), for increasing line spacing */
+    float         lightScaling = 1.0f;
+    float         h123Scaling  = 1.0f; /* glyph scaling (<=1.0), for increasing line spacing */
     if (d->contentFont == firaSans_TextFont) {
         regularFont = &fontFiraSansRegular_Embedded;
         lightFont   = &fontFiraSansLight_Embedded;
         italicFont  = &fontFiraSansItalic_Embedded;
-        scaling     = 0.85f;
+        scaling     = lightScaling = 0.85f;
     }
-    else if (d->contentFont == ebGaramond_TextFont) {
-        regularFont = &fontEBGaramondRegular_Embedded;
-        lightFont   = &fontEBGaramondRegular_Embedded;
-        italicFont  = &fontEBGaramondItalic_Embedded;
+    else if (d->contentFont == tinos_TextFont) {
+        regularFont = &fontTinosRegular_Embedded;
+        lightFont   = &fontLiterataExtraLightopsz18_Embedded;
+        italicFont  = &fontTinosItalic_Embedded;
+        scaling      = 0.85f;
     }
     else if (d->contentFont == literata_TextFont) {
         regularFont = &fontLiterataRegularopsz14_Embedded;
@@ -193,9 +195,10 @@ static void initFonts_Text_(iText *d) {
         h3Font      = &fontFiraSansRegular_Embedded;
         h123Scaling = 0.85f;
     }
-    else if (d->headingFont == ebGaramond_TextFont) {
-        h12Font = &fontEBGaramondBold_Embedded;
-        h3Font  = &fontEBGaramondRegular_Embedded;
+    else if (d->headingFont == tinos_TextFont) {
+        h12Font = &fontTinosBold_Embedded;
+        h3Font  = &fontTinosRegular_Embedded;
+        h123Scaling = 0.85f;
     }
     else if (d->headingFont == literata_TextFont) {
         h12Font = &fontLiterataBoldopsz36_Embedded;
@@ -213,15 +216,15 @@ static void initFonts_Text_(iText *d) {
         { &fontFiraMonoRegular_Embedded,      fontSize_UI * 0.866f, 1.0f, defaultSymbols_FontId },
         { &fontSourceSansProRegular_Embedded, textSize,             scaling, symbols_FontId },
         /* content fonts */
-        { regularFont,                        textSize,             scaling,     symbols_FontId },
-        { &fontFiraMonoRegular_Embedded,      monoSize,             1.0f,        monospaceSymbols_FontId },
-        { &fontFiraMonoRegular_Embedded,      monoSize * 0.750f,    1.0f,        monospaceSmallSymbols_FontId },
-        { regularFont,                        textSize * 1.200f,    scaling,     mediumSymbols_FontId },
-        { h3Font,                             textSize * 1.333f,    scaling,     bigSymbols_FontId },
-        { italicFont,                         textSize,             scaling,     symbols_FontId },
-        { h12Font,                            textSize * 1.666f,    h123Scaling, largeSymbols_FontId },
-        { h12Font,                            textSize * 2.000f,    h123Scaling, hugeSymbols_FontId },
-        { lightFont,                          textSize * 1.666f,    scaling,     largeSymbols_FontId },
+        { regularFont,                        textSize,             scaling,      symbols_FontId },
+        { &fontFiraMonoRegular_Embedded,      monoSize,             1.0f,         monospaceSymbols_FontId },
+        { &fontFiraMonoRegular_Embedded,      monoSize * 0.750f,    1.0f,         monospaceSmallSymbols_FontId },
+        { regularFont,                        textSize * 1.200f,    scaling,      mediumSymbols_FontId },
+        { h3Font,                             textSize * 1.333f,    scaling,      bigSymbols_FontId },
+        { italicFont,                         textSize,             scaling,      symbols_FontId },
+        { h12Font,                            textSize * 1.666f,    h123Scaling,  largeSymbols_FontId },
+        { h12Font,                            textSize * 2.000f,    h123Scaling,  hugeSymbols_FontId },
+        { lightFont,                          textSize * 1.666f,    lightScaling, largeSymbols_FontId },
         /* monospace content fonts */
         { &fontFiraMonoRegular_Embedded,      textSize,             0.8f, symbols_FontId },
         /* symbol fonts */
diff --git a/src/ui/text.h b/src/ui/text.h
index e95b75d2..5bae8e2a 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -124,7 +124,7 @@ enum iTextFont {
     nunito_TextFont,
     firaSans_TextFont,
     literata_TextFont,
-    ebGaramond_TextFont,
+    tinos_TextFont,
 };
 
 extern int gap_Text; /* affected by content font size */
diff --git a/src/ui/util.c b/src/ui/util.c
index 9ac18881..bdb348f9 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -987,7 +987,7 @@ 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", "EB Garamond"
+        "Nunito", "Fira Sans", "Literata", "Tinos"
     };
     iForIndices(i, fontNames) {
         addRadioButton_(parent,