Added two serif fonts; minor color tweaks

Added the EB Garamond and Literata fonts as serif font choices.

18 files changed, 218 insertions, 5 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59701fad..4d0e087b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,12 +56,20 @@ set (EMBED_RESOURCES
     res/about/lagrange.gmi
     res/about/license.gmi
     res/about/version.gmi
+    res/fonts/EBGaramond-Regular.ttf
+    res/fonts/EBGaramond-Medium.ttf
+    res/fonts/EBGaramond-Italic.ttf
+    res/fonts/EBGaramond-Bold.ttf
     res/fonts/FiraMono-Regular.ttf
     res/fonts/FiraSans-Bold.ttf
     res/fonts/FiraSans-Italic.ttf
     res/fonts/FiraSans-Light.ttf
     res/fonts/FiraSans-Regular.ttf
     res/fonts/KosugiMaru-Regular.ttf
+    res/fonts/Literata-Regular-opsz=14.ttf
+    res/fonts/Literata-Bold-opsz=36.ttf
+    res/fonts/Literata-ExtraLight-opsz=18.ttf
+    res/fonts/Literata-LightItalic-opsz=14.ttf
     res/fonts/NotoEmoji-Regular.ttf
     res/fonts/Nunito-ExtraBold.ttf
     res/fonts/Nunito-ExtraLight.ttf
diff --git a/Embed.cmake b/Embed.cmake
index 2322e32c..75f3e06f 100644
--- a/Embed.cmake
+++ b/Embed.cmake
@@ -9,6 +9,7 @@ option (ENABLE_RESOURCE_EMBED "Embed resources inside the executable" OFF)
 function (embed_getname output fn)
     get_filename_component (name ${fn} NAME_WE)
     string (REPLACE "-" "" name ${name})
+    string (REPLACE "=" "" name ${name})
     string (SUBSTRING ${name} 0 1 first)
     string (TOUPPER ${first} first)
     string (SUBSTRING ${name} 1 -1 remainder)
diff --git a/res/about/license.gmi b/res/about/license.gmi
index 4f654540..25fb7f05 100644
--- a/res/about/license.gmi
+++ b/res/about/license.gmi
@@ -94,7 +94,9 @@ 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/googlefonts/nunito/blob/master/OFL.txt  Nunito
 => https://github.com/adobe-fonts/source-sans-pro/blob/release/LICENSE.md  Source Sans Pro
 
diff --git a/res/fonts/EBGaramond-Bold.ttf b/res/fonts/EBGaramond-Bold.ttf
new file mode 100644
index 00000000..f380a1c3
--- /dev/null
+++ b/res/fonts/EBGaramond-Bold.ttf
diff --git a/res/fonts/EBGaramond-Italic.ttf b/res/fonts/EBGaramond-Italic.ttf
new file mode 100644
index 00000000..a7201b00
--- /dev/null
+++ b/res/fonts/EBGaramond-Italic.ttf
diff --git a/res/fonts/EBGaramond-Medium.ttf b/res/fonts/EBGaramond-Medium.ttf
new file mode 100644
index 00000000..b9d6964d
--- /dev/null
+++ b/res/fonts/EBGaramond-Medium.ttf
diff --git a/res/fonts/EBGaramond-Regular.ttf b/res/fonts/EBGaramond-Regular.ttf
new file mode 100644
index 00000000..f57146c9
--- /dev/null
+++ b/res/fonts/EBGaramond-Regular.ttf
diff --git a/res/fonts/LICENSE_EBGaramond.txt b/res/fonts/LICENSE_EBGaramond.txt
new file mode 100644
index 00000000..1fb3e844
--- /dev/null
+++ b/res/fonts/LICENSE_EBGaramond.txt
@@ -0,0 +1,93 @@
+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/LICENSE_Literata.txt b/res/fonts/LICENSE_Literata.txt
new file mode 100644
index 00000000..8bf7b94f
--- /dev/null
+++ b/res/fonts/LICENSE_Literata.txt
@@ -0,0 +1,93 @@
+Copyright 2017 The Literata Project Authors (https://github.com/googlefonts/literata)

+

+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/Literata-Bold-opsz=36.ttf b/res/fonts/Literata-Bold-opsz=36.ttf
new file mode 100644
index 00000000..0b36bcc5
--- /dev/null
+++ b/res/fonts/Literata-Bold-opsz=36.ttf
diff --git a/res/fonts/Literata-ExtraLight-opsz=18.ttf b/res/fonts/Literata-ExtraLight-opsz=18.ttf
new file mode 100644
index 00000000..adf2269c
--- /dev/null
+++ b/res/fonts/Literata-ExtraLight-opsz=18.ttf
diff --git a/res/fonts/Literata-LightItalic-opsz=14.ttf b/res/fonts/Literata-LightItalic-opsz=14.ttf
new file mode 100644
index 00000000..4549f26e
--- /dev/null
+++ b/res/fonts/Literata-LightItalic-opsz=14.ttf
diff --git a/res/fonts/Literata-Regular-opsz=14.ttf b/res/fonts/Literata-Regular-opsz=14.ttf
new file mode 100644
index 00000000..e523b1ce
--- /dev/null
+++ b/res/fonts/Literata-Regular-opsz=14.ttf
diff --git a/src/gmdocument.c b/src/gmdocument.c
index e2696085..f800f6ed 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -799,9 +799,9 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
 
             if (delta_Color(get_Color(tmHeading3_ColorId), get_Color(tmParagraph_ColorId)) <= 80) {
                 /* Smallest headings may be too close to body text color. */
-                iHSLColor clr = get_HSLColor(tmParagraph_ColorId);
-                clr.lum       = iMax(0.5f, clr.lum - 0.15f);
-                setHsl_Color(tmParagraph_ColorId, clr);
+//                iHSLColor clr = get_HSLColor(tmParagraph_ColorId);
+//                clr.lum       = iMax(0.5f, clr.lum - 0.15f);
+                //setHsl_Color(tmParagraph_ColorId, clr);
                 setHsl_Color(tmHeading3_ColorId,
                              addSatLum_HSLColor(get_HSLColor(tmHeading3_ColorId), 0, 0.15f));
             }
diff --git a/src/ui/color.c b/src/ui/color.c
index 9d2c4132..2cf7ebbd 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -199,7 +199,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiAnnotation_ColorId, gray50_ColorId);
             copy_(uiIcon_ColorId, brown_ColorId);
             copy_(uiIconHover_ColorId, brown_ColorId);
-            copy_(uiSeparator_ColorId, gray75_ColorId);
+            copy_(uiSeparator_ColorId, gray50_ColorId);
             copy_(uiMarked_ColorId, cyan_ColorId);
             copy_(uiMatching_ColorId, orange_ColorId);
             break;
diff --git a/src/ui/text.c b/src/ui/text.c
index eb6c66e8..8d8aa19c 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -166,7 +166,7 @@ static void initFonts_Text_(iText *d) {
     const iBlock *italicFont  = &fontNunitoLightItalic_Embedded;
     const iBlock *boldFont    = &fontNunitoExtraBold_Embedded;
     const iBlock *lightFont   = &fontNunitoExtraLight_Embedded;
-    float         scaling     = 1.0f; /* additional glyph scaling (<=1), to increase line spacing */
+    float         scaling     = 1.0f; /* glyph scaling (<=1.0), for increasing line spacing */
     if (d->contentFont == firaSans_TextFont) {
         regularFont = &fontFiraSansRegular_Embedded;
         italicFont  = &fontFiraSansItalic_Embedded;
@@ -174,6 +174,18 @@ static void initFonts_Text_(iText *d) {
         lightFont   = &fontFiraSansLight_Embedded;
         scaling     = 0.85f;
     }
+    else if (d->contentFont == ebGaramond_TextFont) {
+        regularFont = &fontEBGaramondRegular_Embedded;
+        italicFont  = &fontEBGaramondItalic_Embedded;
+        boldFont    = &fontEBGaramondBold_Embedded;
+        lightFont   = &fontLiterataExtraLightopsz18_Embedded;
+    }
+    else if (d->contentFont == literata_TextFont) {
+        regularFont = &fontLiterataRegularopsz14_Embedded;
+        italicFont  = &fontLiterataLightItalicopsz14_Embedded;
+        boldFont    = &fontLiterataBoldopsz36_Embedded;
+        lightFont   = &fontLiterataExtraLightopsz18_Embedded;
+    }
     const struct {
         const iBlock *ttf;
         int size;
diff --git a/src/ui/text.h b/src/ui/text.h
index fa7b9402..fe4ddef1 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -108,6 +108,8 @@ iLocalDef iBool isVariationSelector_Char(iChar ch) {
 enum iTextFont {
     nunito_TextFont,
     firaSans_TextFont,
+    literata_TextFont,
+    ebGaramond_TextFont,
 };
 
 extern int gap_Text; /* affected by content font size */
diff --git a/src/ui/util.c b/src/ui/util.c
index 89f71da2..c061231d 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -925,6 +925,8 @@ iWidget *makePreferences_Widget(void) {
         /* Fonts. */ {
             addRadioButton_(fonts, "prefs.font.0", "Nunito", "font.set arg:0");
             addRadioButton_(fonts, "prefs.font.1", "Fira Sans", "font.set arg:1");
+            addRadioButton_(fonts, "prefs.font.2", "Literata", "font.set arg:2");
+            addRadioButton_(fonts, "prefs.font.3", "EB Garamond", "font.set arg:3");
         }
         addChildFlags_Widget(values, iClob(fonts), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
         addChild_Widget(headings, iClob(makeHeading_Widget("Line width:")));