diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2020-11-19 08:34:13 +0200 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2020-11-19 08:34:13 +0200 |
commit | 9396695caf57ddcdcc58b6dea1fcae3ef942c21f (patch) | |
tree | 6edd59ce7e432c30f81fcb5b54604285654d1a05 | |
parent | bbda6d5ec0481eb8b8803cf601bb2ea8bb7f8da5 (diff) |
Replaced Japanese font with Noto Sans CJK JP
Alas, a couple of megabytes larger than Kosugi Maru, but has better glyph coverage.
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | res/about/license.gmi | 2 | ||||
-rw-r--r-- | res/fonts/NotoSansJP-Regular.ttf | bin | 0 -> 5636040 bytes | |||
-rw-r--r-- | src/ui/text.c | 16 |
4 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 05325a44..35e7707f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -65,13 +65,13 @@ set (EMBED_RESOURCES | |||
65 | res/fonts/FiraSans-Italic.ttf | 65 | res/fonts/FiraSans-Italic.ttf |
66 | res/fonts/FiraSans-Light.ttf | 66 | res/fonts/FiraSans-Light.ttf |
67 | res/fonts/FiraSans-Regular.ttf | 67 | res/fonts/FiraSans-Regular.ttf |
68 | res/fonts/KosugiMaru-Regular.ttf | ||
69 | res/fonts/Literata-Regular-opsz=14.ttf | 68 | res/fonts/Literata-Regular-opsz=14.ttf |
70 | res/fonts/Literata-Bold-opsz=36.ttf | 69 | res/fonts/Literata-Bold-opsz=36.ttf |
71 | res/fonts/Literata-ExtraLight-opsz=18.ttf | 70 | res/fonts/Literata-ExtraLight-opsz=18.ttf |
72 | res/fonts/Literata-LightItalic-opsz=10.ttf | 71 | res/fonts/Literata-LightItalic-opsz=10.ttf |
73 | res/fonts/NanumGothic-Regular.ttf | 72 | res/fonts/NanumGothic-Regular.ttf |
74 | res/fonts/NotoEmoji-Regular.ttf | 73 | res/fonts/NotoEmoji-Regular.ttf |
74 | res/fonts/NotoSansJP-Regular.ttf | ||
75 | res/fonts/Nunito-ExtraBold.ttf | 75 | res/fonts/Nunito-ExtraBold.ttf |
76 | res/fonts/Nunito-ExtraLight.ttf | 76 | res/fonts/Nunito-ExtraLight.ttf |
77 | res/fonts/Nunito-LightItalic.ttf | 77 | res/fonts/Nunito-LightItalic.ttf |
diff --git a/res/about/license.gmi b/res/about/license.gmi index abd4577d..96ca4ddd 100644 --- a/res/about/license.gmi +++ b/res/about/license.gmi | |||
@@ -104,11 +104,11 @@ This application uses fonts licensed under the Open Font License. | |||
104 | => https://github.com/mozilla/Fira/blob/master/LICENSE Fira Sans, Fira Mono | 104 | => https://github.com/mozilla/Fira/blob/master/LICENSE Fira Sans, Fira Mono |
105 | => https://github.com/googlefonts/literata/blob/master/OFL.txt Literata | 105 | => https://github.com/googlefonts/literata/blob/master/OFL.txt Literata |
106 | => https://github.com/google/fonts/blob/master/ofl/nanumgothic/OFL.txt Nanum Gothic | 106 | => https://github.com/google/fonts/blob/master/ofl/nanumgothic/OFL.txt Nanum Gothic |
107 | => https://www.google.com/get/noto/help/cjk/ Noto Sans CJK JP | ||
107 | => https://github.com/googlefonts/nunito/blob/master/OFL.txt Nunito | 108 | => https://github.com/googlefonts/nunito/blob/master/OFL.txt Nunito |
108 | => https://github.com/adobe-fonts/source-sans-pro/blob/release/LICENSE.md Source Sans Pro | 109 | => https://github.com/adobe-fonts/source-sans-pro/blob/release/LICENSE.md Source Sans Pro |
109 | 110 | ||
110 | Additional fonts: | 111 | Additional fonts: |
111 | 112 | ||
112 | => https://fonts.google.com/specimen/Kosugi+Maru#license Kosugi Maru (Apache License 2.0) | ||
113 | => https://github.com/googlefonts/noto-emoji/blob/master/LICENSE Noto Emoji (Apache License 2.0) | 113 | => https://github.com/googlefonts/noto-emoji/blob/master/LICENSE Noto Emoji (Apache License 2.0) |
114 | => https://dn-works.com/ufas/ Symbola (Public Domain) | 114 | => https://dn-works.com/ufas/ Symbola (Public Domain) |
diff --git a/res/fonts/NotoSansJP-Regular.ttf b/res/fonts/NotoSansJP-Regular.ttf new file mode 100644 index 00000000..9a35ce95 --- /dev/null +++ b/res/fonts/NotoSansJP-Regular.ttf | |||
Binary files differ | |||
diff --git a/src/ui/text.c b/src/ui/text.c index 60337c10..8b3badb4 100644 --- a/src/ui/text.c +++ b/src/ui/text.c | |||
@@ -247,14 +247,14 @@ static void initFonts_Text_(iText *d) { | |||
247 | { &fontNotoEmojiRegular_Embedded, monoSize, 1.0f, monospaceSymbols_FontId }, | 247 | { &fontNotoEmojiRegular_Embedded, monoSize, 1.0f, monospaceSymbols_FontId }, |
248 | { &fontNotoEmojiRegular_Embedded, monoSize * 0.750f, 1.0f, monospaceSmallSymbols_FontId }, | 248 | { &fontNotoEmojiRegular_Embedded, monoSize * 0.750f, 1.0f, monospaceSmallSymbols_FontId }, |
249 | /* japanese fonts */ | 249 | /* japanese fonts */ |
250 | { &fontKosugiMaruRegular_Embedded, fontSize_UI, 1.0f, defaultSymbols_FontId }, | 250 | { &fontNotoSansJPRegular_Embedded, fontSize_UI, 1.0f, defaultSymbols_FontId }, |
251 | { &fontKosugiMaruRegular_Embedded, monoSize * 0.750, 1.0f, monospaceSmallSymbols_FontId }, | 251 | { &fontNotoSansJPRegular_Embedded, monoSize * 0.750, 1.0f, monospaceSmallSymbols_FontId }, |
252 | { &fontKosugiMaruRegular_Embedded, monoSize, 1.0f, monospaceSymbols_FontId }, | 252 | { &fontNotoSansJPRegular_Embedded, monoSize, 1.0f, monospaceSymbols_FontId }, |
253 | { &fontKosugiMaruRegular_Embedded, textSize, 1.0f, symbols_FontId }, | 253 | { &fontNotoSansJPRegular_Embedded, textSize, 1.0f, symbols_FontId }, |
254 | { &fontKosugiMaruRegular_Embedded, textSize * 1.200f, 1.0f, mediumSymbols_FontId }, | 254 | { &fontNotoSansJPRegular_Embedded, textSize * 1.200f, 1.0f, mediumSymbols_FontId }, |
255 | { &fontKosugiMaruRegular_Embedded, textSize * 1.333f, 1.0f, bigSymbols_FontId }, | 255 | { &fontNotoSansJPRegular_Embedded, textSize * 1.333f, 1.0f, bigSymbols_FontId }, |
256 | { &fontKosugiMaruRegular_Embedded, textSize * 1.666f, 1.0f, largeSymbols_FontId }, | 256 | { &fontNotoSansJPRegular_Embedded, textSize * 1.666f, 1.0f, largeSymbols_FontId }, |
257 | { &fontKosugiMaruRegular_Embedded, textSize * 2.000f, 1.0f, hugeSymbols_FontId }, | 257 | { &fontNotoSansJPRegular_Embedded, textSize * 2.000f, 1.0f, hugeSymbols_FontId }, |
258 | /* korean fonts */ | 258 | /* korean fonts */ |
259 | { &fontNanumGothicRegular_Embedded, fontSize_UI, 1.0f, defaultSymbols_FontId }, | 259 | { &fontNanumGothicRegular_Embedded, fontSize_UI, 1.0f, defaultSymbols_FontId }, |
260 | { &fontNanumGothicRegular_Embedded, monoSize * 0.750, 1.0f, monospaceSmallSymbols_FontId }, | 260 | { &fontNanumGothicRegular_Embedded, monoSize * 0.750, 1.0f, monospaceSmallSymbols_FontId }, |