5 files changed, 144 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bdb8de4..9e105f02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,6 +71,7 @@ set (EMBED_RESOURCES
     res/fonts/Literata-Bold-opsz=36.ttf
     res/fonts/Literata-ExtraLight-opsz=18.ttf
     res/fonts/Literata-LightItalic-opsz=10.ttf
+    res/fonts/NanumGothic-Regular.ttf
     res/fonts/NotoEmoji-Regular.ttf
     res/fonts/Nunito-ExtraBold.ttf
     res/fonts/Nunito-ExtraLight.ttf
diff --git a/res/fonts/LICENSE_NanumGothic.txt b/res/fonts/LICENSE_NanumGothic.txt
new file mode 100644
index 00000000..69ff4015
--- /dev/null
+++ b/res/fonts/LICENSE_NanumGothic.txt
@@ -0,0 +1,96 @@
+Copyright (c) 2010, NHN Corporation (http://www.nhncorp.com),
+with Reserved Font Name Nanum, Naver Nanum, NanumGothic, Naver 
+NanumGothic, NanumMyeongjo, Naver NanumMyeongjo, NanumBrush, Naver
+NanumBrush, NanumPen, Naver NanumPen.
+
+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/NanumGothic-Regular.ttf b/res/fonts/NanumGothic-Regular.ttf
new file mode 100644
index 00000000..6e4dd874
--- /dev/null
+++ b/res/fonts/NanumGothic-Regular.ttf
diff --git a/src/ui/text.c b/src/ui/text.c
index 08c89e47..7f784dec 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -80,9 +80,9 @@ iChar char_Glyph(const iGlyph *d) {
 
 iDefineTypeConstructionArgs(Glyph, (iChar ch), ch)
 
-/*-----------------------------------------------------------------------------------------------*/
+    /*-----------------------------------------------------------------------------------------------*/
 
-struct Impl_Font {
+    struct Impl_Font {
     iBlock *       data;
     stbtt_fontinfo font;
     float          scale;
@@ -92,8 +92,9 @@ struct Impl_Font {
     iHash          glyphs;
     iBool          isMonospaced;
     iBool          manualKernOnly;
-    enum iFontId   symbolsFont; /* font to use for symbols */
+    enum iFontId   symbolsFont;  /* font to use for symbols */
     enum iFontId   japaneseFont; /* font to use for Japanese glyphs */
+    enum iFontId   koreanFont;   /* font to use for Korean glyphs */
     uint32_t       indexTable[128 - 32];
 };
 
@@ -109,9 +110,10 @@ static void init_Font(iFont *d, const iBlock *data, int height, float scale, enu
     d->vertOffset = height * (1.0f - scale) / 2;
     int ascent;
     stbtt_GetFontVMetrics(&d->font, &ascent, NULL, NULL);
-    d->baseline = (int) ascent * d->scale;
-    d->symbolsFont = symbolsFont;
+    d->baseline     = (int) ascent * d->scale;
+    d->symbolsFont  = symbolsFont;
     d->japaneseFont = regularJapanese_FontId;
+    d->koreanFont   = regularKorean_FontId;
     d->isMonospaced = iFalse;
     memset(d->indexTable, 0xff, sizeof(d->indexTable));
 }
@@ -247,6 +249,15 @@ static void initFonts_Text_(iText *d) {
         { &fontKosugiMaruRegular_Embedded,    textSize * 1.333f,    1.0f, bigSymbols_FontId },
         { &fontKosugiMaruRegular_Embedded,    textSize * 1.666f,    1.0f, largeSymbols_FontId },
         { &fontKosugiMaruRegular_Embedded,    textSize * 2.000f,    1.0f, hugeSymbols_FontId },
+        /* korean fonts */
+        { &fontNanumGothicRegular_Embedded,   fontSize_UI,          1.0f, defaultSymbols_FontId },
+        { &fontNanumGothicRegular_Embedded,   monoSize * 0.750,     1.0f, monospaceSmallSymbols_FontId },
+        { &fontNanumGothicRegular_Embedded,   monoSize,             1.0f, monospaceSymbols_FontId },
+        { &fontNanumGothicRegular_Embedded,   textSize,             1.0f, symbols_FontId },
+        { &fontNanumGothicRegular_Embedded,   textSize * 1.200f,    1.0f, mediumSymbols_FontId },
+        { &fontNanumGothicRegular_Embedded,   textSize * 1.333f,    1.0f, bigSymbols_FontId },
+        { &fontNanumGothicRegular_Embedded,   textSize * 1.666f,    1.0f, largeSymbols_FontId },
+        { &fontNanumGothicRegular_Embedded,   textSize * 2.000f,    1.0f, hugeSymbols_FontId },
     };
     iForIndices(i, fontData) {
         iFont *font = &d->fonts[i];
@@ -262,7 +273,6 @@ static void initFonts_Text_(iText *d) {
     /* Japanese script. */ {
         /* Everything defaults to the regular sized japanese font, so these are just
            the other sizes. */
-        /* TODO: Add these to the table above... */
         font_Text_(default_FontId)->japaneseFont          = defaultJapanese_FontId;
         font_Text_(defaultMedium_FontId)->japaneseFont    = defaultJapanese_FontId;
         font_Text_(defaultMonospace_FontId)->japaneseFont = defaultJapanese_FontId;
@@ -270,11 +280,22 @@ static void initFonts_Text_(iText *d) {
         font_Text_(monospace_FontId)->japaneseFont        = monospaceJapanese_FontId;
         font_Text_(medium_FontId)->japaneseFont           = mediumJapanese_FontId;
         font_Text_(big_FontId)->japaneseFont              = bigJapanese_FontId;
-//        font_Text_(bigBold_FontId)->japaneseFont          = bigJapanese_FontId;
         font_Text_(largeBold_FontId)->japaneseFont        = largeJapanese_FontId;
         font_Text_(largeLight_FontId)->japaneseFont       = largeJapanese_FontId;
         font_Text_(hugeBold_FontId)->japaneseFont         = hugeJapanese_FontId;
     }
+    /* Korean script. */ {
+        font_Text_(default_FontId)->koreanFont          = defaultKorean_FontId;
+        font_Text_(defaultMedium_FontId)->koreanFont    = defaultKorean_FontId;
+        font_Text_(defaultMonospace_FontId)->koreanFont = defaultKorean_FontId;
+        font_Text_(monospaceSmall_FontId)->koreanFont   = monospaceSmallKorean_FontId;
+        font_Text_(monospace_FontId)->koreanFont        = monospaceKorean_FontId;
+        font_Text_(medium_FontId)->koreanFont           = mediumKorean_FontId;
+        font_Text_(big_FontId)->koreanFont              = bigKorean_FontId;
+        font_Text_(largeBold_FontId)->koreanFont        = largeKorean_FontId;
+        font_Text_(largeLight_FontId)->koreanFont       = largeKorean_FontId;
+        font_Text_(hugeBold_FontId)->koreanFont         = hugeKorean_FontId;
+    }
     gap_Text = iRound(gap_UI * d->contentFontSize);
 }
 
@@ -491,6 +512,13 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
             return emoji;
         }
     }
+    /* Could be Korean. */
+    if (ch > 0x3000) {
+        iFont *korean = font_Text_(d->koreanFont);
+        if (korean != d && (*glyphIndex = glyphIndex_Font_(korean, ch)) != 0) {
+            return korean;
+        }
+    }
     /* Japanese perhaps? */
     if (ch > 0x3040) {
         iFont *japanese = font_Text_(d->japaneseFont);
@@ -501,6 +529,9 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
     /* Fall back to Symbola for anything else. */
     iFont *font = font_Text_(d->symbolsFont);
     *glyphIndex = glyphIndex_Font_(font, ch);
+    if (!*glyphIndex) {
+        fprintf(stderr, "failed to find %08x (%lc)\n", ch, ch); fflush(stderr);
+    }
     return font;
 }
 
diff --git a/src/ui/text.h b/src/ui/text.h
index 87f69300..35f48528 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -72,6 +72,15 @@ enum iFontId {
     bigJapanese_FontId,
     largeJapanese_FontId,
     hugeJapanese_FontId,
+    /* korean script */
+    defaultKorean_FontId,
+    monospaceSmallKorean_FontId,
+    monospaceKorean_FontId,
+    regularKorean_FontId,
+    mediumKorean_FontId,
+    bigKorean_FontId,
+    largeKorean_FontId,
+    hugeKorean_FontId,
     max_FontId,
 
     /* Meta: */