27 files changed, 116 insertions, 44 deletions

diff --git a/po/en.po b/po/en.po
index 9b09ec9c..daa848d3 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1448,8 +1448,17 @@ msgstr "Text Color"
 msgid "prefs.imagestyle.preformat"
 msgstr "Preformatted Color"
 
-msgid "prefs.headingfont"
-msgstr "Heading font:"
+msgid "prefs.font.ui"
+msgstr "UI:"
+
+msgid "prefs.font.heading"
+msgstr "Headings:"
+
+msgid "prefs.font.body"
+msgstr "Body:"
+
+msgid "prefs.font.mono"
+msgstr "Preformatted:"
 
 msgid "prefs.font"
 msgstr "Body font:"
@@ -1457,6 +1466,10 @@ msgstr "Body font:"
 msgid "prefs.mono"
 msgstr "Monospace body:"
 
+# Font to use for headings and body when Monospace body is enabled.
+msgid "prefs.font.monodoc"
+msgstr "Monospace font:"
+
 msgid "prefs.mono.gemini"
 msgstr "Gemini"
 
diff --git a/res/arabic.fontpack/fontpack.ini b/res/arabic.fontpack/fontpack.ini
index e35efaad..00ad5241 100644
--- a/res/arabic.fontpack/fontpack.ini
+++ b/res/arabic.fontpack/fontpack.ini
@@ -1,4 +1,4 @@
 [arabic]
 name        = "Noto Sans Arabic UI"
 auxiliary   = true
-regular     = "NotoSansArabicUI.ttf"
+regular     = "NotoSansArabicUI-Regular.ttf"
diff --git a/res/cjk.fontpack/fontpack.ini b/res/cjk.fontpack/fontpack.ini
index 5a4bfbac..fbac54be 100644
--- a/res/cjk.fontpack/fontpack.ini
+++ b/res/cjk.fontpack/fontpack.ini
@@ -6,11 +6,11 @@ regular     = "NotoSansJP-Regular.ttf"
 
 [notosanssc]
 name        = "Noto Sans SC"
-auxiliary   = true
 priority    = 2
 regular     = "NotoSansSC-Regular.ttf"
 
 [nanumgothic]
 name        = "Nanum Gothic"
-regular     = "NanumGothic-Regular.ttf"
+auxiliary   = true
 priority    = 1
+regular     = "NanumGothic-Regular.ttf"
diff --git a/res/firasans.fontpack/fontpack.ini b/res/firasans.fontpack/fontpack.ini
index fbe3136f..4378a757 100644
--- a/res/firasans.fontpack/fontpack.ini
+++ b/res/firasans.fontpack/fontpack.ini
@@ -1,6 +1,6 @@
 [firasans]
 name        = "Fira Sans"
-scaling     = 0.85
+glyphscale  = 0.85
 regular     = "FiraSans-Regular.ttf"
 italic      = "FiraSans-Italic.ttf"
 light       = "FiraSans-Light.ttf"
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 83819479..146d5381 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 4ccf7d6d..4bf379c3 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index 1977d746..deb8318a 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index d2467d5b..009a5602 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/es_MX.bin b/res/lang/es_MX.bin
index 9e0d208a..2dd5c250 100644
--- a/res/lang/es_MX.bin
+++ b/res/lang/es_MX.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index 6dc728d2..9fc77c32 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index bccab53e..e1ade2d7 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/gl.bin b/res/lang/gl.bin
index 01f62e90..817af16d 100644
--- a/res/lang/gl.bin
+++ b/res/lang/gl.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index 1a289523..0dde0e4f 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index a20c8542..648dca41 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index 857c5d01..9d721ea5 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index 22895b5c..f0f47033 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 754833d8..1f59057b 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index 38287319..a31a6fd5 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 2c2608ba..c5aa0b2b 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index db2f0a0f..19a11654 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index c98e9f81..86d96d3e 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index e1866c74..fc0cb990 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/res/nunito.fontpack/fontpack.ini b/res/nunito.fontpack/fontpack.ini
index e9d913a2..ea4a12b8 100644
--- a/res/nunito.fontpack/fontpack.ini
+++ b/res/nunito.fontpack/fontpack.ini
@@ -1,5 +1,6 @@
 [nunito]
 name        = "Nunito"
+tweaks      = 0x1     # some hardcoded kerning changes (`Th`, etc.)
 regular     = "Nunito-Regular.ttf"
 italic      = "Nunito-LightItalic.ttf"
 light       = "Nunito-ExtraLight.ttf"
diff --git a/res/tinos.fontpack/fontpack.ini b/res/tinos.fontpack/fontpack.ini
index eeefb8eb..8759b752 100644
--- a/res/tinos.fontpack/fontpack.ini
+++ b/res/tinos.fontpack/fontpack.ini
@@ -1,5 +1,6 @@
 [tinos]
 name        = "Tinos"
+glyphscale  = 0.850
 regular     = "Tinos-Regular.ttf"
 italic      = "Tinos-Italic.ttf"
 bold        = "Tinos-Bold.ttf"
diff --git a/src/fontpack.c b/src/fontpack.c
index 3b42e848..ca1d1582 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -21,17 +21,18 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "fontpack.h"
+#include "embedded.h"
+#include "app.h"
 
 #include <the_Foundation/archive.h>
 #include <the_Foundation/array.h>
 #include <the_Foundation/file.h>
+#include <the_Foundation/fileinfo.h>
 #include <the_Foundation/path.h>
 #include <the_Foundation/ptrarray.h>
 #include <the_Foundation/string.h>
 #include <the_Foundation/toml.h>
 
-#include "embedded.h"
-
 /* TODO: Clean up and/or reorder this file, it's a bit unorganized. */
 
 float scale_FontSize(enum iFontSize size) {
@@ -196,10 +197,13 @@ void init_FontPack(iFontPack *d) {
 }
 
 void deinit_FontPack(iFontPack *d) {
+    delete_String(d->loadPath);
     iForEach(Array, i, &d->fonts) {
         deinit_FontSpec(i.value);
     }
     deinit_Array(&d->fonts);
+    iAssert(d->archive == NULL);
+    iAssert(d->loadSpec == NULL);
 }
 
 iDefineTypeConstruction(FontPack)
@@ -208,8 +212,11 @@ void handleIniTable_FontPack_(void *context, const iString *table, iBool isStart
     iFontPack *d = context;
     if (isStart) {
         iAssert(!d->loadSpec);
-        d->loadSpec = new_FontSpec();
-        set_String(&d->loadSpec->id, table);
+        /* Each font ID must be unique. */
+        if (!findSpec_Fonts(cstr_String(table))) {
+            d->loadSpec = new_FontSpec();
+            set_String(&d->loadSpec->id, table);
+        }
     }
     else {
         /* Set fallback font files. */ {
@@ -265,7 +272,8 @@ void handleIniKeyValue_FontPack_(void *context, const iString *table, const iStr
         d->loadSpec->priority = (int) value->value.int64;        
     }
     else if (!cmp_String(key, "height")) {
-        d->loadSpec->heightScale[0] = d->loadSpec->heightScale[1] = (float) number_TomlValue(value);
+        d->loadSpec->heightScale[0] = d->loadSpec->heightScale[1] =
+            iMin(2.0f, (float) number_TomlValue(value));
     }
     else if (!cmp_String(key, "glyphscale")) {
         d->loadSpec->glyphScale[0] = d->loadSpec->glyphScale[1] = (float) number_TomlValue(value);
@@ -277,7 +285,7 @@ void handleIniKeyValue_FontPack_(void *context, const iString *table, const iStr
     else if (startsWith_String(key, "ui.") || startsWith_String(key, "doc.")) {
         const int scope = startsWith_String(key, "ui.") ? 0 : 1;        
         if (endsWith_String(key, ".height")) {
-            d->loadSpec->heightScale[scope] = (float) number_TomlValue(value);
+            d->loadSpec->heightScale[scope] = iMin(2.0f, (float) number_TomlValue(value));
         }
         if (endsWith_String(key, ".glyphscale")) {
             d->loadSpec->glyphScale[scope] = (float) number_TomlValue(value);
@@ -330,18 +338,12 @@ void handleIniKeyValue_FontPack_(void *context, const iString *table, const iStr
 static iBool load_FontPack_(iFontPack *d, const iString *ini) {
     iBeginCollect();
     iBool ok = iFalse;
-//    iFile *f = iClob(new_File(iniPath));
-    //if (open_File(f, text_FileMode | readOnly_FileMode)) {
-//        d->loadPath = collect_String(newRange_String(dirName_Path(iniPath)));
-//    iString *src = collect_String(readString_File(f));
     iTomlParser *toml = collect_TomlParser(new_TomlParser());
     setHandlers_TomlParser(toml, handleIniTable_FontPack_, handleIniKeyValue_FontPack_, d);
     if (parse_TomlParser(toml, ini)) {
         ok = iTrue;
     }
     iAssert(d->loadSpec == NULL);
-//        d->loadPath = NULL;
-//    }
     iEndCollect();
     return ok;
 }
@@ -381,6 +383,7 @@ iBool loadArchive_FontPack(iFontPack *d, const iArchive *zip) {
         }
         deinit_String(&ini);
     }
+    d->archive = NULL;
     return ok;
 }
 
@@ -423,13 +426,65 @@ void init_Fonts(const char *userDir) {
     init_PtrArray(&d->specOrder);
     /* Load the required fonts. */ {
         iFontPack *pack = new_FontPack();
-        iArchive *defaultPack = new_Archive();
-        openData_Archive(defaultPack, &fontpackDefault_Embedded);
-        loadArchive_FontPack(pack, defaultPack);
-        iRelease(defaultPack);
+        iArchive *arch = new_Archive();
+        openData_Archive(arch, &fontpackDefault_Embedded);
+        loadArchive_FontPack(pack, arch); /* should never fail if we've made it this far */
+        iRelease(arch);
         pushBack_PtrArray(&d->packs, pack);
     }
-    /* TODO: find and load .fontpack files in known locations */
+    /* Find and load .fontpack files in known locations. */ {
+        const char *locations[] = {
+            ".",
+            "./fonts",
+            "../share/lagrange",
+            "../../share/lagrange",
+            concatPath_CStr(userDir, "fonts"),
+            userDir,
+        };
+        const iString *execDir = collectNewRange_String(dirName_Path(execPath_App()));
+        iForIndices(i, locations) {
+            const iString *dir = concatCStr_Path(execDir, locations[i]);
+            iForEach(DirFileInfo, entry, iClob(new_DirFileInfo(dir))) {
+                const iString *entryPath = path_FileInfo(entry.value);
+                if (endsWithCase_String(entryPath, ".fontpack")) {
+                    iArchive *arch = new_Archive();
+                    if (openFile_Archive(arch, entryPath)) {
+                        iFontPack *pack = new_FontPack();
+                        pack->loadPath = copy_String(entryPath);
+                        if (loadArchive_FontPack(pack, arch)) {
+                            pushBack_PtrArray(&d->packs, pack);
+                        }
+                        else {
+                            delete_FontPack(pack);
+                            fprintf(stderr,
+                                    "[fonts] errors detected in fontpack: %s\n",
+                                    cstr_String(entryPath));
+                        }
+                    }
+                    iRelease(arch);
+                }
+            }
+        }
+    }
+    /* A standalone .ini file in the config directory. */ {
+        const iString *userIni = collectNewCStr_String(concatPath_CStr(userDir, "fonts.ini"));
+        iFile *f = new_File(userIni);
+        if (open_File(f, text_FileMode | readOnly_FileMode)) {
+            const iString *src = collect_String(readString_File(f));
+            iFontPack *pack = new_FontPack();
+            pack->loadPath = copy_String(userIni);
+            if (load_FontPack_(pack, src)) {
+                pushBack_PtrArray(&d->packs, pack);
+            }
+            else {
+                delete_FontPack(pack);
+                fprintf(stderr,
+                        "[fonts] errors detected in fonts.ini: %s\n",
+                        cstr_String(userIni));                
+            }
+        }
+        iRelease(f);
+    }
     sortSpecs_Fonts_(d);
 }
 
diff --git a/src/ui/text.c b/src/ui/text.c
index 14b4e305..3ed5b327 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -472,7 +472,8 @@ static void deinitFonts_Text_(iText *d) {
 }
 
 static int maxGlyphHeight_Text_(const iText *d) {
-    return 2 * d->contentFontSize * fontSize_UI;
+    /* Huge size is 2 * contentFontSize. */
+    return 4 * d->contentFontSize * fontSize_UI;
 }
 
 static void initCache_Text_(iText *d) {
@@ -491,7 +492,7 @@ static void initCache_Text_(iText *d) {
     /* Allocate initial (empty) rows. These will be assigned actual locations in the cache
        once at least one glyph is stored. */
     for (int h = d->cacheRowAllocStep;
-         h <= 2.5 * textSize + d->cacheRowAllocStep;
+         h <= 5 * textSize + d->cacheRowAllocStep;
          h += d->cacheRowAllocStep) {
         pushBack_Array(&d->cacheRows, &(iCacheRow){ .height = 0 });
     }
diff --git a/src/ui/util.c b/src/ui/util.c
index 73193c7a..0e079efb 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2523,8 +2523,6 @@ iWidget *makePreferences_Widget(void) {
     /* Fonts. */ {
         setId_Widget(appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.fonts}", '4', &headings, &values), "prefs.page.fonts");
         /* Fonts. */ {
-            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font.ui}")));
-            addFontButtons_(values, "ui");
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font.heading}")));
             addFontButtons_(values, "heading");
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font.body}")));
@@ -2532,41 +2530,44 @@ iWidget *makePreferences_Widget(void) {
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font.mono}")));
             addFontButtons_(values, "mono");
             addDialogPadding_(headings, values);
-            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.mono}")));
-            iWidget *mono = new_Widget(); {
+            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.boldlink}")));
+            iWidget *boldLink = new_Widget(); {
+                /* TODO: Add a utility function for this type of toggles? (also for above) */
                 iWidget *tog;
                 setTextCStr_LabelWidget(
-                    addChild_Widget(mono, tog = iClob(makeToggle_Widget("prefs.mono.gemini"))),
-                    "${prefs.mono.gemini}");
+                    addChild_Widget(boldLink, tog = iClob(makeToggle_Widget("prefs.boldlink.dark"))),
+                    "${prefs.boldlink.dark}");
                 setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
                 updateSize_LabelWidget((iLabelWidget *) tog);
                 setTextCStr_LabelWidget(
-                    addChild_Widget(mono, tog = iClob(makeToggle_Widget("prefs.mono.gopher"))),
-                    "${prefs.mono.gopher}");
+                    addChild_Widget(boldLink, tog = iClob(makeToggle_Widget("prefs.boldlink.light"))),
+                    "${prefs.boldlink.light}");
                 setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
                 updateSize_LabelWidget((iLabelWidget *) tog);
             }
-            addChildFlags_Widget(values, iClob(mono), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
-            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font.monodoc}")));
-            addFontButtons_(values, "monodoc");
+            addChildFlags_Widget(values, iClob(boldLink), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
             addDialogPadding_(headings, values);
-            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.boldlink}")));
-            iWidget *boldLink = new_Widget(); {
-                /* TODO: Add a utility function for this type of toggles? (also for above) */
+            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.mono}")));
+            iWidget *mono = new_Widget(); {
                 iWidget *tog;
                 setTextCStr_LabelWidget(
-                    addChild_Widget(boldLink, tog = iClob(makeToggle_Widget("prefs.boldlink.dark"))),
-                    "${prefs.boldlink.dark}");
+                    addChild_Widget(mono, tog = iClob(makeToggle_Widget("prefs.mono.gemini"))),
+                    "${prefs.mono.gemini}");
                 setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
                 updateSize_LabelWidget((iLabelWidget *) tog);
                 setTextCStr_LabelWidget(
-                    addChild_Widget(boldLink, tog = iClob(makeToggle_Widget("prefs.boldlink.light"))),
-                    "${prefs.boldlink.light}");
+                    addChild_Widget(mono, tog = iClob(makeToggle_Widget("prefs.mono.gopher"))),
+                    "${prefs.mono.gopher}");
                 setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
                 updateSize_LabelWidget((iLabelWidget *) tog);
             }
-            addChildFlags_Widget(values, iClob(boldLink), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+            addChildFlags_Widget(values, iClob(mono), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font.monodoc}")));
+            addFontButtons_(values, "monodoc");
             addDialogPadding_(headings, values);
+            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font.ui}")));
+            addFontButtons_(values, "ui");
+            //            addDialogPadding_(headings, values);
 //            /* Custom font. */ {
 //                iInputWidget *customFont = new_InputWidget(0);
 //                setHint_InputWidget(customFont, "${hint.prefs.userfont}");