summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gmdocument.c2
-rw-r--r--src/ui/text.c20
-rw-r--r--src/ui/text.h1
3 files changed, 15 insertions, 8 deletions
diff --git a/src/gmdocument.c b/src/gmdocument.c
index c533a7f4..ad47f693 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -620,6 +620,8 @@ void init_GmDocument(iGmDocument *d) {
620 init_String(&d->title); 620 init_String(&d->title);
621 init_Array(&d->headings, sizeof(iGmHeading)); 621 init_Array(&d->headings, sizeof(iGmHeading));
622 init_PtrArray(&d->images); 622 init_PtrArray(&d->images);
623 d->themeSeed = 0;
624 d->siteIcon = 0;
623} 625}
624 626
625void deinit_GmDocument(iGmDocument *d) { 627void deinit_GmDocument(iGmDocument *d) {
diff --git a/src/ui/text.c b/src/ui/text.c
index 1e714320..63b15572 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -198,6 +198,7 @@ static void initFonts_Text_(iText *d) {
198 { &fontNotoEmojiRegular_Embedded, textSize * 2.000f, hugeSymbols_FontId }, 198 { &fontNotoEmojiRegular_Embedded, textSize * 2.000f, hugeSymbols_FontId },
199 { &fontNotoEmojiRegular_Embedded, textSize * 0.866f, smallSymbols_FontId }, 199 { &fontNotoEmojiRegular_Embedded, textSize * 0.866f, smallSymbols_FontId },
200 /* japanese fonts */ 200 /* japanese fonts */
201 { &fontKosugiMaruRegular_Embedded, fontSize_UI, defaultSymbols_FontId },
201 { &fontKosugiMaruRegular_Embedded, textSize * 0.666f, smallSymbols_FontId }, 202 { &fontKosugiMaruRegular_Embedded, textSize * 0.666f, smallSymbols_FontId },
202 { &fontKosugiMaruRegular_Embedded, textSize, symbols_FontId }, 203 { &fontKosugiMaruRegular_Embedded, textSize, symbols_FontId },
203 { &fontKosugiMaruRegular_Embedded, textSize * 1.200f, mediumSymbols_FontId }, 204 { &fontKosugiMaruRegular_Embedded, textSize * 1.200f, mediumSymbols_FontId },
@@ -219,14 +220,17 @@ static void initFonts_Text_(iText *d) {
219 /* Everything defaults to the regular sized japanese font, so these are just 220 /* Everything defaults to the regular sized japanese font, so these are just
220 the other sizes. */ 221 the other sizes. */
221 /* TODO: Add these to the table above... */ 222 /* TODO: Add these to the table above... */
222 font_Text_(monospace_FontId)->japaneseFont = smallJapanese_FontId; 223 font_Text_(default_FontId)->japaneseFont = defaultJapanese_FontId;
223 font_Text_(monospaceSmall_FontId)->japaneseFont = smallJapanese_FontId; 224 font_Text_(defaultMedium_FontId)->japaneseFont = defaultJapanese_FontId;
224 font_Text_(medium_FontId)->japaneseFont = mediumJapanese_FontId; 225 font_Text_(defaultMonospace_FontId)->japaneseFont = defaultJapanese_FontId;
225 font_Text_(big_FontId)->japaneseFont = bigJapanese_FontId; 226 font_Text_(monospace_FontId)->japaneseFont = smallJapanese_FontId;
226 font_Text_(bigBold_FontId)->japaneseFont = bigJapanese_FontId; 227 font_Text_(monospaceSmall_FontId)->japaneseFont = smallJapanese_FontId;
227 font_Text_(largeBold_FontId)->japaneseFont = largeJapanese_FontId; 228 font_Text_(medium_FontId)->japaneseFont = mediumJapanese_FontId;
228 font_Text_(largeLight_FontId)->japaneseFont = largeJapanese_FontId; 229 font_Text_(big_FontId)->japaneseFont = bigJapanese_FontId;
229 font_Text_(hugeBold_FontId)->japaneseFont = hugeJapanese_FontId; 230 font_Text_(bigBold_FontId)->japaneseFont = bigJapanese_FontId;
231 font_Text_(largeBold_FontId)->japaneseFont = largeJapanese_FontId;
232 font_Text_(largeLight_FontId)->japaneseFont = largeJapanese_FontId;
233 font_Text_(hugeBold_FontId)->japaneseFont = hugeJapanese_FontId;
230 } 234 }
231 gap_Text = iRound(gap_UI * d->contentFontSize); 235 gap_Text = iRound(gap_UI * d->contentFontSize);
232} 236}
diff --git a/src/ui/text.h b/src/ui/text.h
index 116aab2c..dfdd6b7e 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -64,6 +64,7 @@ enum iFontId {
64 hugeEmoji_FontId, 64 hugeEmoji_FontId,
65 smallEmoji_FontId, 65 smallEmoji_FontId,
66 /* japanese script */ 66 /* japanese script */
67 defaultJapanese_FontId,
67 smallJapanese_FontId, 68 smallJapanese_FontId,
68 regularJapanese_FontId, 69 regularJapanese_FontId,
69 mediumJapanese_FontId, 70 mediumJapanese_FontId,