summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2020-08-04 15:57:50 +0300
committerJaakko Keränen <jaakko.keranen@iki.fi>2020-08-04 15:57:50 +0300
commit84909b4deba7ed90eed591cefe457be482628ecf (patch)
treed66a7454d80cd55adf08d331ca93d2fd7d2eb819
parentd11e15acc10026e36d8dc0665be2002821d2579b (diff)
Added a large light font for the site banner
-rw-r--r--CMakeLists.txt1
-rwxr-xr-xres/FiraSans-Light.ttfbin0 -> 397116 bytes
-rw-r--r--src/gmdocument.h3
-rw-r--r--src/ui/text.c1
-rw-r--r--src/ui/text.h3
5 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6a8c666..7dd4ca2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,7 @@ set (EMBED_RESOURCES
20 res/SourceSansPro-Regular.ttf 20 res/SourceSansPro-Regular.ttf
21 res/FiraSans-Regular.ttf 21 res/FiraSans-Regular.ttf
22 res/FiraSans-Bold.ttf 22 res/FiraSans-Bold.ttf
23 res/FiraSans-Light.ttf
23 res/FiraSans-Italic.ttf 24 res/FiraSans-Italic.ttf
24 res/FiraMono-Regular.ttf 25 res/FiraMono-Regular.ttf
25 res/NotoEmoji-Regular.ttf 26 res/NotoEmoji-Regular.ttf
diff --git a/res/FiraSans-Light.ttf b/res/FiraSans-Light.ttf
new file mode 100755
index 00000000..2ad0374b
--- /dev/null
+++ b/res/FiraSans-Light.ttf
Binary files differ
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 215dcdb5..e280bef8 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -23,7 +23,7 @@ enum iGmLinkFlags {
23 userFriendly_GmLinkFlag = iBit(10), 23 userFriendly_GmLinkFlag = iBit(10),
24 imageFileExtension_GmLinkFlag = iBit(11), 24 imageFileExtension_GmLinkFlag = iBit(11),
25 audioFileExtension_GmLinkFlag = iBit(12), 25 audioFileExtension_GmLinkFlag = iBit(12),
26 content_GmLinkFlag = iBit(13), /* content visible below */ 26 content_GmLinkFlag = iBit(13), /* content visible below */
27 visited_GmLinkFlag = iBit(14), /* in the history */ 27 visited_GmLinkFlag = iBit(14), /* in the history */
28}; 28};
29 29
@@ -38,6 +38,7 @@ struct Impl_GmImageInfo {
38enum iGmRunFlags { 38enum iGmRunFlags {
39 startOfLine_GmRunFlag = iBit(1), 39 startOfLine_GmRunFlag = iBit(1),
40 endOfLine_GmRunFlag = iBit(2), 40 endOfLine_GmRunFlag = iBit(2),
41 siteBanner_GmRunlag = iBit(3), /* area reserved for the site banner */
41}; 42};
42 43
43struct Impl_GmRun { 44struct Impl_GmRun {
diff --git a/src/ui/text.c b/src/ui/text.c
index ca3f5fba..0c4b8624 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -130,6 +130,7 @@ static void initFonts_Text_(iText *d) {
130 { &fontFiraSansBold_Embedded, textSize * 1.333f, mediumSymbols_FontId }, 130 { &fontFiraSansBold_Embedded, textSize * 1.333f, mediumSymbols_FontId },
131 { &fontFiraSansBold_Embedded, textSize * 1.666f, largeSymbols_FontId }, 131 { &fontFiraSansBold_Embedded, textSize * 1.666f, largeSymbols_FontId },
132 { &fontFiraSansBold_Embedded, textSize * 2.000f, hugeSymbols_FontId }, 132 { &fontFiraSansBold_Embedded, textSize * 2.000f, hugeSymbols_FontId },
133 { &fontFiraSansLight_Embedded, textSize * 1.666f, largeSymbols_FontId },
133 { &fontSymbola_Embedded, fontSize_UI, defaultSymbols_FontId }, 134 { &fontSymbola_Embedded, fontSize_UI, defaultSymbols_FontId },
134 { &fontSymbola_Embedded, textSize, symbols_FontId }, 135 { &fontSymbola_Embedded, textSize, symbols_FontId },
135 { &fontSymbola_Embedded, textSize * 1.333f, mediumSymbols_FontId }, 136 { &fontSymbola_Embedded, textSize * 1.333f, mediumSymbols_FontId },
diff --git a/src/ui/text.h b/src/ui/text.h
index ea58abb6..2068d51b 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -17,6 +17,8 @@ enum iFontId {
17 mediumBold_FontId, 17 mediumBold_FontId,
18 largeBold_FontId, 18 largeBold_FontId,
19 hugeBold_FontId, 19 hugeBold_FontId,
20 largeLight_FontId,
21 /* symbol fonts */
20 defaultSymbols_FontId, 22 defaultSymbols_FontId,
21 symbols_FontId, 23 symbols_FontId,
22 mediumSymbols_FontId, 24 mediumSymbols_FontId,
@@ -45,6 +47,7 @@ enum iFontId {
45 header1_FontId = hugeBold_FontId, 47 header1_FontId = hugeBold_FontId,
46 header2_FontId = largeBold_FontId, 48 header2_FontId = largeBold_FontId,
47 header3_FontId = medium_FontId, 49 header3_FontId = medium_FontId,
50 banner_FontId = largeLight_FontId,
48}; 51};
49 52
50extern int gap_Text; /* affected by content font size */ 53extern int gap_Text; /* affected by content font size */