Revised runtime font management

The built-in fonts are loaded via FontPack, and the font table is now constructed dynamically based on available fonts.

A full set of variants (style, size) are prepared for each font, but some of the data gets allocated lazily when needed.

GmRun needed a larger allocation for fonts, so now all the fields are combined into a single bit field.

TODO: Glyph scaling, vertical offsets, and symbol lookup are still not fully working.

11 files changed, 322 insertions, 256 deletions

diff --git a/src/ui/color.h b/src/ui/color.h
index 179db3e9..c9dff598 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -160,7 +160,7 @@ enum iColorId {
     tmGopherLinkDomain_ColorId,
     tmGopherLinkLastVisitDate_ColorId,
 
-    max_ColorId,
+    max_ColorId, /* note: GmRun packs color into limited number of bits */
     tmMax_ColorId = max_ColorId - tmFirst_ColorId
 };
 
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 589b9e56..b83490f9 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -928,8 +928,9 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
         pushBackCStr_StringArray(title, "Lagrange");
     }
     /* Take away parts if it doesn't fit. */
-    const int avail = bounds_Widget(as_Widget(tabButton)).size.x - 3 * gap_UI;
-    iBool setWindow = (document_App() == d && isUnderKeyRoot_Widget(d));
+    const int avail     = bounds_Widget(as_Widget(tabButton)).size.x - 3 * gap_UI;
+    iBool     setWindow = (document_App() == d && isUnderKeyRoot_Widget(d));
+    const int font      = uiLabel_FontId;
     for (;;) {
         iString *text = collect_String(joinCStr_StringArray(title, " \u2014 "));
         if (setWindow) {
@@ -945,7 +946,7 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
             prependChar_String(text, siteIcon);
             prependCStr_String(text, escape_Color(uiIcon_ColorId));
         }
-        const int width = measureRange_Text(default_FontId, range_String(text)).advance.x;
+        const int width = measureRange_Text(font, range_String(text)).advance.x;
         if (width <= avail ||
             isEmpty_StringArray(title)) {
             updateText_LabelWidget(tabButton, text);
@@ -954,9 +955,9 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
         if (size_StringArray(title) == 1) {
             /* Just truncate to fit. */
             const char *endPos;
-            tryAdvanceNoWrap_Text(default_FontId,
+            tryAdvanceNoWrap_Text(font,
                                   range_String(text),
-                                  avail - measure_Text(default_FontId, "...").advance.x,
+                                  avail - measure_Text(font, "...").advance.x,
                                   &endPos);
             updateText_LabelWidget(
                 tabButton,
@@ -1619,7 +1620,7 @@ static void parseUser_DocumentWidget_(iDocumentWidget *d) {
 static void cacheRunGlyphs_(void *data, const iGmRun *run) {
     iUnused(data);
     if (!isEmpty_Range(&run->text)) {
-        cache_Text(run->textParams.font, run->text);
+        cache_Text(run->font, run->text);
     }
 }
 
@@ -4020,14 +4021,14 @@ static void fillRange_DrawContext_(iDrawContext *d, const iGmRun *run, enum iCol
                       contains_Range(&mark, run->text.start))) {
         int x = 0;
         if (!*isInside) {
-            x = measureRange_Text(run->textParams.font,
+            x = measureRange_Text(run->font,
                                   (iRangecc){ run->text.start, iMax(run->text.start, mark.start) })
                     .advance.x;
         }
         int w = width_Rect(run->visBounds) - x;
         if (contains_Range(&run->text, mark.end) || mark.end < run->text.start) {
             w = measureRange_Text(
-                    run->textParams.font,
+                    run->font,
                     !*isInside ? mark
                                : (iRangecc){ run->text.start, iMax(run->text.start, mark.end) })
                     .advance.x;
@@ -4083,15 +4084,15 @@ static void drawBannerRun_DrawContext_(iDrawContext *d, const iGmRun *run, iInt2
     iInt2 bpos = add_I2(visPos, init_I2(0, lineHeight_Text(banner_FontId) / 2));
     if (icon) {
         appendChar_String(&str, icon);
-        const iRect iconRect = visualBounds_Text(run->textParams.font, range_String(&str));
+        const iRect iconRect = visualBounds_Text(run->font, range_String(&str));
         drawRange_Text(
-            run->textParams.font,
-            addY_I2(bpos, -mid_Rect(iconRect).y + lineHeight_Text(run->textParams.font) / 2),
+            run->font,
+            addY_I2(bpos, -mid_Rect(iconRect).y + lineHeight_Text(run->font) / 2),
             tmBannerIcon_ColorId,
             range_String(&str));
         bpos.x += right_Rect(iconRect) + 3 * gap_Text;
     }
-    drawRange_Text(run->textParams.font,
+    drawRange_Text(run->font,
                    bpos,
                    tmBannerTitle_ColorId,
                    bannerText_DocumentWidget_(d->widget));
@@ -4198,7 +4199,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
         /* Media UIs are drawn afterwards as a dynamic overlay. */
         return;
     }
-    enum iColorId      fg        = run->textParams.color;
+    enum iColorId      fg        = run->color;
     const iGmDocument *doc       = d->widget->doc;
     const int          linkFlags = linkFlags_GmDocument(doc, run->linkId);
     /* Hover state of a link. */
@@ -4265,10 +4266,10 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
         const iInt2 margin = preRunMargin_GmDocument(doc, run->preId);
         fillRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, tmBackgroundAltText_ColorId);
         drawRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, tmQuoteIcon_ColorId);
-        drawWrapRange_Text(run->textParams.font,
+        drawWrapRange_Text(run->font,
                            add_I2(visPos, margin),
                            run->visBounds.size.x - 2 * margin.x,
-                           run->textParams.color,
+                           run->color,
                            run->text);
     }
     else if (run->flags & siteBanner_GmRunFlag) {
@@ -4287,17 +4288,17 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                     linkOrdinalChar_DocumentWidget_(d->widget, ord - d->widget->ordinalBase);
                 if (ordChar) {
                     const char *circle = "\u25ef"; /* Large Circle */
-                    const int   circleFont = defaultContentRegular_FontId;
+                    const int   circleFont = FONT_ID(default_FontId, regular_FontStyle, contentRegular_FontSize);
                     iRect nbArea = { init_I2(d->viewPos.x - gap_UI / 3, visPos.y),
                                      init_I2(3.95f * gap_Text, 1.0f * lineHeight_Text(circleFont)) };
                     drawRange_Text(
                         circleFont, topLeft_Rect(nbArea), tmQuote_ColorId, range_CStr(circle));
                     iRect circleArea = visualBounds_Text(circleFont, range_CStr(circle));
                     addv_I2(&circleArea.pos, topLeft_Rect(nbArea));
-                    drawCentered_Text(defaultContentSmall_FontId,
+                    drawCentered_Text(FONT_ID(default_FontId, regular_FontStyle, contentSmall_FontSize),
                                       circleArea,
                                       iTrue,
-                                    tmQuote_ColorId,
+                                      tmQuote_ColorId,
                                       "%lc",
                                       (int) ordChar);
                     goto runDrawn;
@@ -4307,15 +4308,15 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
         if (run->flags & quoteBorder_GmRunFlag) {
             drawVLine_Paint(&d->paint,
                             addX_I2(visPos,
-                                    !run->textParams.isRTL
+                                    !run->isRTL
                                         ? -gap_Text * 5 / 2
                                         : (width_Rect(run->visBounds) + gap_Text * 5 / 2)),
                             height_Rect(run->visBounds),
                             tmQuoteIcon_ColorId);
         }
-        drawBoundRange_Text(run->textParams.font,
+        drawBoundRange_Text(run->font,
                             visPos,
-                            (run->textParams.isRTL ? -1 : 1) * width_Rect(run->visBounds),
+                            (run->isRTL ? -1 : 1) * width_Rect(run->visBounds),
                             fg,
                             run->text);
     runDrawn:;
@@ -4431,7 +4432,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                 append_String(&str, collect_String(format_Date(&date, "%b %d")));
             }
             if (!isEmpty_String(&str)) {
-                if (run->textParams.isRTL) {
+                if (run->isRTL) {
                     appendCStr_String(&str, " \u2014 ");
                 }
                 else {
@@ -4440,7 +4441,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                 const iInt2 textSize = measure_Text(metaFont, cstr_String(&str)).bounds.size;
                 int tx = topRight_Rect(linkRect).x;
                 const char *msg = cstr_String(&str);
-                if (run->textParams.isRTL) {
+                if (run->isRTL) {
                     tx = topLeft_Rect(linkRect).x - textSize.x;                    
                 }
                 if (tx + textSize.x > right_Rect(d->widgetBounds)) {
@@ -4909,7 +4910,7 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
     }
     /* Pinch zoom indicator. */
     if (d->flags & pinchZoom_DocumentWidgetFlag) {
-        const int   font   = defaultLargeBold_FontId;
+        const int   font   = uiLabelLargeBold_FontId;
         const int   height = lineHeight_Text(font) * 2;
         const iInt2 size   = init_I2(height * 2, height);
         const iRect rect   = { sub_I2(mid_Rect(bounds), divi_I2(size, 2)), size };
diff --git a/src/ui/mediaui.c b/src/ui/mediaui.c
index b622a554..22552027 100644
--- a/src/ui/mediaui.c
+++ b/src/ui/mediaui.c
@@ -86,7 +86,7 @@ static int drawSevenSegmentTime_(iInt2 pos, int color, int align, int seconds) {
     const int hours = seconds / 3600;
     const int mins  = (seconds / 60) % 60;
     const int secs  = seconds % 60;
-    const int font  = defaultBig_FontId;
+    const int font  = uiLabelBig_FontId;
     iString   num;
     init_String(&num);
     if (hours) {
@@ -123,7 +123,7 @@ void draw_PlayerUI(iPlayerUI *d, iPaint *p) {
         drawPlayerButton_(
             p, d->volumeRect, volumeChar_(volume_Player(d->player)), uiContentSymbols_FontId);
     }
-    const int   hgt       = lineHeight_Text(defaultBig_FontId);
+    const int   hgt       = lineHeight_Text(uiLabelBig_FontId);
     const int   yMid      = mid_Rect(d->scrubberRect).y;
     const float playTime  = time_Player(d->player);
     const float totalTime = duration_Player(d->player);
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index 3cb6e631..f11769f5 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -48,11 +48,11 @@ static iBool isSideBySideLayout_(void) {
 }
 
 static enum iFontId labelFont_(void) {
-    return deviceType_App() == phone_AppDeviceType ? defaultBig_FontId : defaultMedium_FontId;
+    return deviceType_App() == phone_AppDeviceType ? uiLabelBig_FontId : uiLabelMedium_FontId;
 }
 
 static enum iFontId labelBoldFont_(void) {
-    return deviceType_App() == phone_AppDeviceType ? defaultBigBold_FontId : defaultMediumBold_FontId;
+    return deviceType_App() == phone_AppDeviceType ? uiLabelBigBold_FontId : uiLabelMediumBold_FontId;
 }
 
 static void updatePanelSheetMetrics_(iWidget *sheet) {
@@ -546,7 +546,7 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
                 updateSize_LabelWidget(button);
             }
             setId_Widget(as_Widget(button), radId);
-            setFont_LabelWidget(button, defaultMedium_FontId);
+            setFont_LabelWidget(button, uiLabelMedium_FontId);
             addChildFlags_Widget(widget, iClob(button), flags);
         }
     }
@@ -1056,7 +1056,7 @@ void initPanels_Mobile(iWidget *panels, iWidget *parentWidget,
                         iForEach(ObjectList, sub, children_Widget(value)) {
                             if (isInstance_Object(sub.object, &Class_LabelWidget)) {
                                 iLabelWidget *opt = sub.object;
-                                setFont_LabelWidget(opt, defaultMedium_FontId);
+                                setFont_LabelWidget(opt, uiLabelMedium_FontId);
                                 setFlags_Widget(as_Widget(opt), noBackground_WidgetFlag, iTrue);
                             }
                         }
diff --git a/src/ui/root.c b/src/ui/root.c
index 63cce62d..a2e6062f 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -447,7 +447,7 @@ static void updateNavBarIdentity_(iWidget *navBar) {
     if (toolName) {
         setOutline_LabelWidget(toolButton, ident == NULL);
         updateTextCStr_LabelWidget(toolName, subjectName ? cstr_String(subjectName) : "");
-        setFont_LabelWidget(toolButton, subjectName ? defaultMedium_FontId : uiLabelLarge_FontId);
+        setFont_LabelWidget(toolButton, subjectName ? uiLabelMedium_FontId : uiLabelLarge_FontId);
         arrange_Widget(parent_Widget(toolButton));
     }
 }
@@ -996,7 +996,7 @@ void updateMetrics_Root(iRoot *d) {
             const iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
             const iWidget *viewButton = findChild_Widget(d->widget, "toolbar.view");
             const iWidget *idButton = findChild_Widget(toolBar, "toolbar.ident");
-            const int font = defaultTiny_FontId;
+            const int font = uiLabelTiny_FontId;
             setFont_LabelWidget(idName, font);
             setPos_Widget(as_Widget(idName),
                           windowToLocal_Widget(as_Widget(idName),
@@ -1125,7 +1125,7 @@ void createUserInterface_Root(iRoot *d) {
                     iClob(newIcon_LabelWidget("\U0001f513", SDLK_i, KMOD_PRIMARY, "document.info")),
                     embedFlags | moveToParentLeftEdge_WidgetFlag);
                 setId_Widget(as_Widget(lock), "navbar.lock");
-                setFont_LabelWidget(lock, symbols_FontId + uiNormal_FontSize);
+//                setFont_LabelWidget(lock, symbols_FontId + uiNormal_FontSize);
                 updateTextCStr_LabelWidget(lock, "\U0001f512");
             }
             /* Button for clearing the URL bar contents. */ {
@@ -1134,7 +1134,8 @@ void createUserInterface_Root(iRoot *d) {
                     iClob(newIcon_LabelWidget(delete_Icon, 0, 0, "navbar.clear")),
                     hidden_WidgetFlag | embedFlags | moveToParentLeftEdge_WidgetFlag | tight_WidgetFlag);
                 setId_Widget(as_Widget(clear), "navbar.clear");
-                setFont_LabelWidget(clear, symbols2_FontId + uiNormal_FontSize);
+//                setFont_LabelWidget(clear, symbols2_FontId + uiNormal_FontSize);
+                setFont_LabelWidget(clear, uiLabelSymbols_FontId);
 //                setFlags_Widget(as_Widget(clear), noBackground_WidgetFlag, iFalse);
 //                setBackgroundColor_Widget(as_Widget(clear), uiBackground_ColorId);
             }
@@ -1149,7 +1150,7 @@ void createUserInterface_Root(iRoot *d) {
                 iLabelWidget *queryInd = new_LabelWidget("${status.query} " return_Icon, NULL);
                 setId_Widget(as_Widget(queryInd), "input.indicator.search");
                 setTextColor_LabelWidget(queryInd, uiTextAction_ColorId);
-                setFont_LabelWidget(queryInd, defaultSmall_FontId);
+                setFont_LabelWidget(queryInd, uiLabelSmall_FontId);
                 setBackgroundColor_Widget(as_Widget(queryInd), uiBackground_ColorId);
                 setFrameColor_Widget(as_Widget(queryInd), uiTextAction_ColorId);
 //                setAlignVisually_LabelWidget(queryInd, iTrue);
@@ -1162,7 +1163,7 @@ void createUserInterface_Root(iRoot *d) {
                 iLabelWidget *fprog = new_LabelWidget("", NULL);
                 setId_Widget(as_Widget(fprog), "feeds.progress");
                 setTextColor_LabelWidget(fprog, uiTextCaution_ColorId);
-                setFont_LabelWidget(fprog, defaultSmall_FontId);
+                setFont_LabelWidget(fprog, uiLabelSmall_FontId);
                 setBackgroundColor_Widget(as_Widget(fprog), uiBackground_ColorId);
 //                setAlignVisually_LabelWidget(fprog, iTrue);
                 setNoAutoMinHeight_LabelWidget(fprog, iTrue);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 057ff614..42661f6b 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -188,7 +188,7 @@ static iLabelWidget *addActionButton_SidebarWidget_(iSidebarWidget *d, const cha
                                              // extraPadding_WidgetFlag : 0) |
                                              flags);
     setFont_LabelWidget(btn, deviceType_App() == phone_AppDeviceType && d->side == right_SidebarSide
-                                 ? defaultBig_FontId
+                                 ? uiLabelBig_FontId
                                  : d->buttonFont);
     checkIcon_LabelWidget(btn);
     return btn;
@@ -742,7 +742,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     d->itemFonts[1] = uiContentBold_FontId;
 #if defined (iPlatformMobile)
     if (deviceType_App() == phone_AppDeviceType) {
-        d->itemFonts[0] = defaultBig_FontId;
+        d->itemFonts[0] = uiLabelBig_FontId;
         d->itemFonts[1] = defaultBigBold_FontId;
     }
     d->widthAsGaps = 73.0f;
@@ -774,7 +774,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
                     format_CStr("%s.mode arg:%d", cstr_String(id_Widget(w)), i))),
                     frameless_WidgetFlag | noBackground_WidgetFlag);
         }
-        setButtonFont_SidebarWidget(d, isPhone ? defaultBig_FontId : uiLabel_FontId);
+        setButtonFont_SidebarWidget(d, isPhone ? uiLabelBig_FontId : uiLabel_FontId);
         addChildFlags_Widget(vdiv,
                              iClob(buttons),
                              arrangeHorizontal_WidgetFlag |
@@ -936,8 +936,8 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
     if (deviceType_App() == phone_AppDeviceType) {
         /* Change font size depending on orientation. */
         const int fonts[2] = {
-            isPortrait_App() ? defaultBig_FontId : uiContent_FontId,
-            isPortrait_App() ? defaultBigBold_FontId : uiContentBold_FontId
+            isPortrait_App() ? uiLabelBig_FontId : uiContent_FontId,
+            isPortrait_App() ? uiLabelBigBold_FontId : uiContentBold_FontId
         };
         if (d->itemFonts[0] != fonts[0]) {
             d->itemFonts[0] = fonts[0];
@@ -945,7 +945,7 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
 //            updateMetrics_SidebarWidget_(d);
             updateItemHeight_SidebarWidget_(d);
         }
-        setButtonFont_SidebarWidget(d, isPortrait_App() ? defaultBig_FontId : uiLabel_FontId);
+        setButtonFont_SidebarWidget(d, isPortrait_App() ? uiLabelBig_FontId : uiLabel_FontId);
     }
     const iBool isTight =
         (width_Rect(bounds_Widget(as_Widget(d->modeButtons[0]))) < d->maxButtonLabelWidth);
@@ -1962,7 +1962,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         deinit_String(&str);
         const iInt2 textPos = addY_I2(topRight_Rect(iconArea), (itemHeight - lineHeight_Text(font)) / 2);
         drawRange_Text(font, textPos, fg, range_String(&d->label));
-        const int metaFont = default_FontId;
+        const int metaFont = uiLabel_FontId;
         const int metaIconWidth = 4.5f * gap_UI;
         const iInt2 metaPos =
             init_I2(right_Rect(itemRect) -
@@ -2045,7 +2045,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         const int indent = 1.4f * lineHeight_Text(font);
         addv_I2(&cPos,
                 init_I2(3 * gap_UI,
-                        (itemHeight - lineHeight_Text(default_FontId) * 2 - lineHeight_Text(font)) /
+                        (itemHeight - lineHeight_Text(uiLabel_FontId) * 2 - lineHeight_Text(font)) /
                             2));
         const int metaFg = isHover ? permanent_ColorId | (isPressing ? uiTextPressed_ColorId
                                                                      : uiTextFramelessHover_ColorId)
@@ -2064,7 +2064,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                        add_I2(cPos, init_I2(indent, 0)),
                        fg,
                        range_String(&d->label));
-        drawRange_Text(default_FontId,
+        drawRange_Text(uiLabel_FontId,
                        add_I2(cPos, init_I2(indent, lineHeight_Text(font))),
                        metaFg,
                        range_String(&d->meta));
diff --git a/src/ui/text.c b/src/ui/text.c
index e3f7f7c4..86fdc084 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -123,40 +123,57 @@ iDefineTypeConstructionArgs(Glyph, (iChar ch), ch)
 
 static iGlyph *glyph_Font_(iFont *d, iChar ch);
 
-struct Impl_Font {
-    iBlock *       data;
-    enum iTextFont family;
-    stbtt_fontinfo font;
-    float          xScale, yScale;
-    int            vertOffset; /* offset due to scaling */
-    int            height;
-    int            baseline;
-    iHash          glyphs; /* key is glyph index in the font */ /* TODO: does not need to be a Hash */
-    iBool          isMonospaced;
-    float          emAdvance;
-    enum iFontSize sizeId;  /* used to look up different fonts of matching size */
+iDeclareType(GlyphTable)
+
+struct Impl_GlyphTable {
+    iHash          glyphs; /* key is glyph index in the font */
+    /* TODO: `glyphs` does not need to be a Hash.
+       We could lazily allocate an array with glyphCount elements instead. */
     uint32_t       indexTable[128 - 32]; /* quick ASCII lookup */
-#if defined (LAGRANGE_ENABLE_HARFBUZZ)
-    hb_blob_t *    hbBlob; /* raw TrueType data */
-    hb_face_t *    hbFace;
-    hb_font_t *    hbMainFont;
-    hb_font_t *    hbFont; /* may be a sub-font with customized font metrics */
-#endif
 };
 
-static iFont *font_Text_(enum iFontId id);
-
-#if 0
-static hb_position_t hbGlyphHKernForNunito_(hb_font_t *font, void *fontData,
-                                            hb_codepoint_t firstGlyph, hb_codepoint_t secondGlyph,
-                                            void *userData) {
-    return 100;
+static void clearGlyphs_Font_(iGlyphTable *d) {
+    iForEach(Hash, i, &d->glyphs) {
+        delete_Glyph((iGlyph *) i.value);
+    }
+    clear_Hash(&d->glyphs);
 }
-#endif
 
-static void init_Font(iFont *d, const iBlock *data, int height, float scale,
-                      enum iFontSize sizeId, iBool isMonospaced) {
+static void init_GlyphTable(iGlyphTable *d) {
     init_Hash(&d->glyphs);
+    memset(d->indexTable, 0xff, sizeof(d->indexTable));
+}
+
+static void deinit_GlyphTable(iGlyphTable *d) {
+    clearGlyphs_Font_(d);
+    deinit_Hash(&d->glyphs);
+}
+
+iDefineTypeConstruction(GlyphTable)
+
+struct Impl_Font {
+    const iFontSpec *fontSpec;
+    const iFontFile *fontFile;
+    int              height;
+    int              baseline;
+    int              vertOffset; /* offset due to glyph scaling */
+    float            xScale, yScale;
+    float            emAdvance;
+    iGlyphTable *    table;
+};
+
+iLocalDef iBool isMonospaced_Font(const iFont *d) {
+    return (d->fontSpec->flags & monospace_FontSpecFlag) != 0;
+}
+
+static iFont *font_Text_(enum iFontId id);
+
+static void init_Font(iFont *d, const iFontSpec *fontSpec, const iFontFile *fontFile,
+                      enum iFontSize sizeId, int height) {
+    d->fontSpec = fontSpec;
+    d->fontFile = fontFile;
+    /* TODO: Nunito kerning fixes need to be a font parameter of its own. */
+#if 0
     d->data = NULL;
     d->family = undefined_TextFont;
     /* Note: We only use `family` currently for applying a kerning fix to Nunito. */
@@ -177,95 +194,49 @@ static void init_Font(iFont *d, const iBlock *data, int height, float scale,
              data == &fontSmolEmojiRegular_Embedded) {
         d->family = emojiAndSymbols_TextFont;
     }
-    d->isMonospaced = isMonospaced;
+#endif
+//    d->isMonospaced = (fontSpec->flags & monospace_FontSpecFlag) != 0;
     d->height = height;
-    iZap(d->font);
-    stbtt_InitFont(&d->font, constData_Block(data), 0);
-    int ascent, descent, emAdv;
-    stbtt_GetFontVMetrics(&d->font, &ascent, &descent, NULL);
-    stbtt_GetCodepointHMetrics(&d->font, 'M', &emAdv, NULL);
-    d->xScale = d->yScale = stbtt_ScaleForPixelHeight(&d->font, height) * scale;
-    if (d->isMonospaced) {
+    //iZap(d->font);
+//    stbtt_InitFont(&d->font, constData_Block(data), 0);
+//    int ascent, descent, emAdv;
+//    stbtt_GetFontVMetrics(&d->font, &ascent, &descent, NULL);
+//    stbtt_GetCodepointHMetrics(&d->font, 'M', &emAdv, NULL);
+    const float scale = fontSpec->scaling;
+    d->xScale = d->yScale = scaleForPixelHeight_FontFile(fontFile, height) * scale;
+    if (isMonospaced_Font(d)) {
         /* It is important that monospaced fonts align 1:1 with the pixel grid so that
            box-drawing characters don't have partially occupied edge pixels, leading to seams
            between adjacent glyphs. */
-        const float advance = (float) emAdv * d->xScale;
+        const float advance = (float) fontFile->emAdvance * d->xScale;
         if (advance > 4) { /* not too tiny */
             d->xScale *= floorf(advance) / advance;
         }
     }
-    d->emAdvance  = emAdv * d->xScale;
-    d->baseline   = ascent * d->yScale;
-    d->vertOffset = height * (1.0f - scale) / 2;
-    /* Custom tweaks. */
-    if (data == &fontNotoSansSymbolsRegular_Embedded) {
-        d->vertOffset *= 1.2f;
-    }
-    else if (data == &fontNotoSansSymbols2Regular_Embedded) {
-        d->vertOffset /= 2;
-    }
-    else if (data == &fontNotoEmojiRegular_Embedded) {
-        //d->vertOffset -= height / 30;
-    }
-    d->sizeId = sizeId;
-    memset(d->indexTable, 0xff, sizeof(d->indexTable));
-#if defined(LAGRANGE_ENABLE_HARFBUZZ)
-    /* HarfBuzz will read the font data. */ {
-        d->hbBlob = hb_blob_create(constData_Block(data), size_Block(data),
-                                   HB_MEMORY_MODE_READONLY, NULL, NULL);
-        d->hbFace = hb_face_create(d->hbBlob, 0);
-        d->hbMainFont = hb_font_create(d->hbFace);
-#if 0
-        /* TODO: The custom kerning function doesn't get called?
-           Maybe HarfBuzz needs FreeType to do kerning? */
-        if (d->family == nunito_TextFont) {
-            /* Customize the kerning of Nunito. */
-            d->hbFont = hb_font_create_sub_font(d->hbMainFont);
-            hb_font_funcs_t *ffs = hb_font_funcs_create();
-            hb_font_funcs_set_glyph_h_kerning_func(ffs, hbGlyphHKernForNunito_, d, NULL);
-            hb_font_set_funcs(d->hbFont, ffs, NULL, NULL);
-            hb_font_funcs_destroy(ffs);
-        }
-        else
-#endif
-        {
-            d->hbFont = hb_font_reference(d->hbMainFont);
-        }
-    }
-#endif
-}
-
-static void clearGlyphs_Font_(iFont *d) {
-    iForEach(Hash, i, &d->glyphs) {
-        delete_Glyph((iGlyph *) i.value);
-    }
-    clear_Hash(&d->glyphs);
+    d->emAdvance  = fontFile->emAdvance * d->xScale;
+    d->baseline   = fontFile->ascent * d->yScale;
+    d->vertOffset = height * (1.0f - scale) / 2 * fontSpec->vertOffset;
+    d->table = NULL;
 }
 
 static void deinit_Font(iFont *d) {
-#if defined(LAGRANGE_ENABLE_HARFBUZZ)
-    /* HarfBuzz objects. */ {
-        hb_font_destroy(d->hbFont);
-        hb_font_destroy(d->hbMainFont);
-        hb_face_destroy(d->hbFace);
-        hb_blob_destroy(d->hbBlob);
-    }
-#endif
-    clearGlyphs_Font_(d);
-    deinit_Hash(&d->glyphs);
-    delete_Block(d->data);
+    delete_GlyphTable(d->table);
 }
 
 static uint32_t glyphIndex_Font_(iFont *d, iChar ch) {
     /* TODO: Add a small cache of ~5 most recently found indices. */
     const size_t entry = ch - 32;
-    if (entry < iElemCount(d->indexTable)) {
-        if (d->indexTable[entry] == ~0u) {
-            d->indexTable[entry] = stbtt_FindGlyphIndex(&d->font, ch);
+    if (!d->table) {
+        d->table = new_GlyphTable();
+    }
+    iGlyphTable *table = d->table;
+    if (entry < iElemCount(table->indexTable)) {
+        if (table->indexTable[entry] == ~0u) {
+            table->indexTable[entry] = findGlyphIndex_FontFile(d->fontFile, ch);
         }
-        return d->indexTable[entry];
+        return table->indexTable[entry];
     }
-    return stbtt_FindGlyphIndex(&d->font, ch);
+    return findGlyphIndex_FontFile(d->fontFile, ch);
 }
 
 /*----------------------------------------------------------------------------------------------*/
@@ -282,7 +253,8 @@ struct Impl_Text {
     enum iTextFont contentFont;
     enum iTextFont headingFont;
     float          contentFontSize;
-    iFont          fonts[max_FontId];
+    iArray         fonts; /* fonts currently selected for use (incl. all styles/sizes) */
+    int            overrideFontId; /* always checked for glyphs first, regardless of which font is used */
     SDL_Renderer * render;
     SDL_Texture *  cache;
     iInt2          cacheSize;
@@ -296,12 +268,49 @@ struct Impl_Text {
 iDefineTypeConstructionArgs(Text, (SDL_Renderer *render), render)
 
 static iText  *activeText_;
-static iBlock *userFont_;
+
+static void setupFontVariants_Text_(iText *d, const iFontSpec *spec, int baseId) {
+#if defined (iPlatformMobile)
+    const float uiSize = fontSize_UI * 1.1f;
+#else
+    const float uiSize = fontSize_UI;
+#endif
+    const float textSize = fontSize_UI * d->contentFontSize;
+//    const float monoSize      = textSize * 0.71f;
+//    const float smallMonoSize = monoSize * 0.8f;
+    if (spec->flags & override_FontSpecFlag && d->overrideFontId < 0) {
+        /* This is the highest priority override font. */
+        d->overrideFontId = baseId;
+    }
+    for (enum iFontStyle style = 0; style < max_FontStyle; style++) {
+        for (enum iFontSize sizeId = 0; sizeId < max_FontSize; sizeId++) {
+            init_Font(font_Text_(FONT_ID(baseId, style, sizeId)),
+                      spec,
+                      spec->styles[style],
+                      sizeId,
+                      (sizeId < contentRegular_FontSize ? uiSize : textSize) * scale_FontSize(sizeId));
+        }
+    }
+}
+
+iLocalDef iFont *font_Text_(enum iFontId id) {
+    return at_Array(&activeText_->fonts, id & mask_FontId);
+}
+
+static enum iFontId fontId_Text_(const iFont *font) {
+    return (enum iFontId) (font - (const iFont *) constData_Array(&activeText_->fonts));
+}
+
+iLocalDef enum iFontSize sizeId_Text_(const iFont *d) {
+    return fontId_Text_(d) % max_FontSize;
+}
+
+iLocalDef enum iFontStyle styleId_Text_(const iFont *d) {
+    return (fontId_Text_(d) / max_FontSize) % max_FontStyle;
+}
 
 static void initFonts_Text_(iText *d) {
-    const float   textSize      = fontSize_UI * d->contentFontSize;
-    const float   monoSize      = textSize * 0.71f;
-    const float   smallMonoSize = monoSize * 0.8f;
+#if 0
     const iBlock *regularFont   = &fontNunitoRegular_Embedded;
     const iBlock *boldFont      = &fontNunitoBold_Embedded;
     const iBlock *italicFont    = &fontNunitoLightItalic_Embedded;
@@ -367,15 +376,10 @@ static void initFonts_Text_(iText *d) {
         h12Font = &fontIosevkaTermExtended_Embedded;
         h3Font  = &fontIosevkaTermExtended_Embedded;
     }
-#if defined (iPlatformMobile)
-    const float uiSize = fontSize_UI * 1.1f;
-#else
-    const float uiSize = fontSize_UI;
-#endif
     const struct {
-        const iBlock *ttf;
-        int size;
-        float scaling;
+        const iFontFile *fontFile;
+        int size; /* pixels */
+//        float scaling;
         enum iFontSize sizeId;
         /* UI sizes: 1.0, 1.125, 1.333, 1.666 */
         /* Content sizes: smallmono, mono, 1.0, 1.2, 1.333, 1.666, 2.0 */
@@ -433,8 +437,34 @@ static void initFonts_Text_(iText *d) {
         DEFINE_FONT_SET(&fontNotoSansArabicUIRegular_Embedded, 1.0f),
 //        DEFINE_FONT_SET(&fontScheherazadeNewRegular_Embedded, 1.0f),
     };
+#endif
+    /* The `fonts` array has precomputed scaling factors and other parameters in all sizes
+       and styles for each available font. Indices to `fonts` act as font runtime IDs. */
+    /* First the mandatory fonts. */
+    d->overrideFontId = -1;
+    resize_Array(&d->fonts, auxiliary_FontId); /* room for the built-ins */
+    iAssert(auxiliary_FontId == documentHeading_FontId + maxVariants_Fonts);
+    setupFontVariants_Text_(d, findSpec_Fonts("default"), default_FontId);
+    setupFontVariants_Text_(d, findSpec_Fonts("iosevka"), monospace_FontId);
+    setupFontVariants_Text_(d, findSpec_Fonts("default"), documentBody_FontId);
+    setupFontVariants_Text_(d, findSpec_Fonts("default"), documentHeading_FontId);
+    /* Check if there are auxiliary fonts available and set those up, too. */
+    iConstForEach(PtrArray, s, listSpecsByPriority_Fonts()) {
+        const iFontSpec *spec = s.ptr;
+        if (spec->flags & auxiliary_FontSpecFlag) {
+            const int fontId = size_Array(&d->fonts);
+            resize_Array(&d->fonts, fontId + maxVariants_Fonts);
+            setupFontVariants_Text_(d, spec, fontId);
+        }
+    }
+    /* test */ {
+        const iFont *h = font_Text_(preformatted_FontId); // FONT_ID(documentBody_FontId, regular_FontStyle, contentRegular_FontSize));
+        printf("{%s} %d sz:%d st:%d\n", cstr_String(&h->fontSpec->name), h->height, sizeId_Text_(h),
+               styleId_Text_(h));
+    }
+#if 0
     iForIndices(i, fontData) {
-        iFont *font = &d->fonts[i];
+        iFont *font = font_Text_(i);
         init_Font(font,
                   fontData[i].ttf,
                   fontData[i].size,
@@ -442,13 +472,15 @@ static void initFonts_Text_(iText *d) {
                   fontData[i].sizeId,
                   fontData[i].ttf == &fontIosevkaTermExtended_Embedded);
     }
+#endif
     gap_Text = iRound(gap_UI * d->contentFontSize);
 }
 
 static void deinitFonts_Text_(iText *d) {
-    iForIndices(i, d->fonts) {
-        deinit_Font(&d->fonts[i]);
+    iForEach(Array, i, &d->fonts) {
+        deinit_Font(i.value);
     }
+    clear_Array(&d->fonts);
 }
 
 static int maxGlyphHeight_Text_(const iText *d) {
@@ -490,6 +522,7 @@ static void deinitCache_Text_(iText *d) {
     SDL_DestroyTexture(d->cache);
 }
 
+#if 0
 void loadUserFonts_Text(void) {
     if (userFont_) {
         delete_Block(userFont_);
@@ -508,9 +541,12 @@ void loadUserFonts_Text(void) {
         iRelease(f);
     }
 }
+#endif
 
 void init_Text(iText *d, SDL_Renderer *render) {
-    loadUserFonts_Text();
+    iText *oldActive = activeText_;
+    activeText_ = d;
+    init_Array(&d->fonts, sizeof(iFont));
     d->contentFont     = nunito_TextFont;
     d->headingFont     = nunito_TextFont;
     d->contentFontSize = contentScale_Text_;
@@ -526,6 +562,7 @@ void init_Text(iText *d, SDL_Renderer *render) {
     }
     initCache_Text_(d);
     initFonts_Text_(d);
+    activeText_ = oldActive;
 }
 
 void deinit_Text(iText *d) {
@@ -534,6 +571,7 @@ void deinit_Text(iText *d) {
     deinitCache_Text_(d);
     d->render = NULL;
     iRelease(d->ansiEscape);
+    deinit_Array(&d->fonts);
 }
 
 void setCurrent_Text(iText *d) {
@@ -569,8 +607,8 @@ void setContentFontSize_Text(iText *d, float fontSizeFactor) {
 
 static void resetCache_Text_(iText *d) {
     deinitCache_Text_(d);
-    for (int i = 0; i < max_FontId; i++) {
-        clearGlyphs_Font_(&d->fonts[i]);
+    iForEach(Array, i, &d->fonts) {
+        clearGlyphs_Font_(i.value);
     }
     initCache_Text_(d);
 }
@@ -582,14 +620,10 @@ void resetFonts_Text(iText *d) {
     initFonts_Text_(d);
 }
 
-iLocalDef iFont *font_Text_(enum iFontId id) {
-    return &activeText_->fonts[id & mask_FontId];
-}
-
 static SDL_Surface *rasterizeGlyph_Font_(const iFont *d, uint32_t glyphIndex, float xShift) {
     int w, h;
-    uint8_t *bmp = stbtt_GetGlyphBitmapSubpixel(
-        &d->font, d->xScale, d->yScale, xShift, 0.0f, glyphIndex, &w, &h, 0, 0);
+    uint8_t *bmp = rasterizeGlyph_FontFile(d->fontFile, d->xScale, d->yScale, xShift, glyphIndex,
+                                           &w, &h);
     SDL_Surface *surface8 =
         SDL_CreateRGBSurfaceWithFormatFrom(bmp, w, h, 8, w, SDL_PIXELFORMAT_INDEX8);
     SDL_SetSurfaceBlendMode(surface8, SDL_BLENDMODE_NONE);
@@ -636,8 +670,8 @@ static iInt2 assignCachePos_Text_(iText *d, iInt2 size) {
 static void allocate_Font_(iFont *d, iGlyph *glyph, int hoff) {
     iRect *glRect = &glyph->rect[hoff];
     int    x0, y0, x1, y1;
-    stbtt_GetGlyphBitmapBoxSubpixel(
-        &d->font, index_Glyph_(glyph), d->xScale, d->yScale, hoff * 0.5f, 0.0f, &x0, &y0, &x1, &y1);
+    measureGlyph_FontFile(d->fontFile, index_Glyph_(glyph), d->xScale, d->yScale, hoff * 0.5f,
+                          &x0, &y0, &x1, &y1);
     glRect->size = init_I2(x1 - x0, y1 - y0);
     /* Determine placement in the glyph cache texture, advancing in rows. */
     glRect->pos    = assignCachePos_Text_(activeText_, glRect->size);
@@ -645,7 +679,7 @@ static void allocate_Font_(iFont *d, iGlyph *glyph, int hoff) {
     glyph->d[hoff].y += d->vertOffset;
     if (hoff == 0) { /* hoff==1 uses same metrics as `glyph` */
         int adv;
-        stbtt_GetGlyphHMetrics(&d->font, index_Glyph_(glyph), &adv, NULL);
+        stbtt_GetGlyphHMetrics(&d->fontFile->stbInfo, index_Glyph_(glyph), &adv, NULL);
         glyph->advance = d->xScale * adv;
     }
 }
@@ -654,13 +688,18 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
     if (isVariationSelector_Char(ch)) {
         return d;
     }
-    /* Smol Emoji overrides all other fonts. */
-    if (ch != 0x20) {
-        iFont *smol = font_Text_(smolEmoji_FontId + d->sizeId);
-        if (smol != d && (*glyphIndex = glyphIndex_Font_(smol, ch)) != 0) {
-            return smol;
+    const enum iFontStyle styleId = styleId_Text_(d);
+    const enum iFontSize  sizeId  = sizeId_Text_(d);
+    iFont *overrideFont = NULL;
+    if (ch != 0x20 && activeText_->overrideFontId >= 0) {
+        /* Override font is checked first. */
+        overrideFont = font_Text_(FONT_ID(activeText_->overrideFontId, styleId, sizeId));
+        if (overrideFont != d && (*glyphIndex = glyphIndex_Font_(overrideFont, ch)) != 0) {
+            return overrideFont;
         }
     }
+#if 0
+    /* TODO: Put arrows in Smol Emoji. */
     /* Manual exceptions. */ {
         if (ch >= 0x2190 && ch <= 0x2193 /* arrows */) {
             d = font_Text_(iosevka_FontId + d->sizeId);
@@ -668,9 +707,23 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
             return d;
         }
     }
+#endif
+    /* The font's own version of the glyph. */
     if ((*glyphIndex = glyphIndex_Font_(d, ch)) != 0) {
         return d;
     }
+    /* As a fallback, check all other available fonts of this size. */
+    for (iFont *font = font_Text_(FONT_ID(0, styleId, sizeId));
+         font < (iFont *) end_Array(&activeText_->fonts);
+         font += maxVariants_Fonts) {
+        if (font == d || font == overrideFont) {
+            continue; /* already checked this one */
+        }
+        if ((*glyphIndex = glyphIndex_Font_(font, ch)) != 0) {
+            return font;
+        }
+    }
+#if 0
     const int fallbacks[] = {
         notoEmoji_FontId,
         symbols2_FontId,
@@ -732,6 +785,7 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
     if (d != font) {
         *glyphIndex = glyphIndex_Font_(font, ch);
     }
+#endif // 0
     if (!*glyphIndex) {
         fprintf(stderr, "failed to find %08x (%lc)\n", ch, (int)ch); fflush(stderr);
     }
@@ -739,8 +793,9 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
 }
 
 static iGlyph *glyphByIndex_Font_(iFont *d, uint32_t glyphIndex) {
+    iAssert(d->table);
     iGlyph* glyph = NULL;
-    void *  node = value_Hash(&d->glyphs, glyphIndex);
+    void *  node = value_Hash(&d->table->glyphs, glyphIndex);
     if (node) {
         glyph = node;
     }
@@ -758,7 +813,7 @@ static iGlyph *glyphByIndex_Font_(iFont *d, uint32_t glyphIndex) {
            and updates the glyph metrics. */
         allocate_Font_(d, glyph, 0);
         allocate_Font_(d, glyph, 1);
-        insert_Hash(&d->glyphs, &glyph->node);
+        insert_Hash(&d->table->glyphs, &glyph->node);
     }
     return glyph;
 }
@@ -866,10 +921,6 @@ static void finishRun_AttributedText_(iAttributedText *d, iAttributedRun *run, i
     run->logical.start = endAt;
 }
 
-static enum iFontId fontId_Text_(const iFont *font) {
-    return (enum iFontId) (font - activeText_->fonts);
-}
-
 static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iChar overrideChar) {
     iAssert(isEmpty_Array(&d->runs));
     size_t length = 0;
@@ -997,14 +1048,14 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
             continue;
         }
         if (ch == 0x20) {
-            if (run.font->family == emojiAndSymbols_TextFont) {
+            if (run.font->fontSpec->flags & auxiliary_FontSpecFlag) {
                 finishRun_AttributedText_(d, &run, pos);
                 run.font = d->font; /* never use space from the symbols font, it's too wide */
             }
             continue;
         }
         iFont *currentFont = d->font;
-        if (run.font->family == arabic_TextFont && isPunct_Char(ch)) {
+        if (run.font->fontSpec->flags & arabic_FontSpecFlag && isPunct_Char(ch)) {
             currentFont = run.font; /* remain as Arabic for whitespace */
         }
         const iGlyph *glyph = glyph_Font_(currentFont, ch);
@@ -1283,7 +1334,7 @@ static iBool notify_WrapText_(iWrapText *d, const char *ending, int origin, int
 
 float horizKern_Font_(iFont *d, uint32_t glyph1, uint32_t glyph2) {
 #if defined (LAGRANGE_ENABLE_KERNING)
-    if (!enableKerning_Text || d->family != nunito_TextFont) {
+    if (!enableKerning_Text || ~d->fontSpec->flags & fixNunitoKerning_FontSpecFlag) {
         return 0.0f;
     }
     if (glyph1 && glyph2) {
@@ -1335,7 +1386,7 @@ static void deinit_GlyphBuffer_(iGlyphBuffer *d) {
 
 static void shape_GlyphBuffer_(iGlyphBuffer *d) {
     if (!d->glyphInfo) {
-        hb_shape(d->font->hbFont, d->hb, NULL, 0);
+        hb_shape(d->font->fontFile->hbFont, d->hb, NULL, 0);
         d->glyphInfo = hb_buffer_get_glyph_infos(d->hb, &d->glyphCount);
         d->glyphPos  = hb_buffer_get_glyph_positions(d->hb, &d->glyphCount);
     }
@@ -1389,7 +1440,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
     float        xCursor    = 0.0f;
     float        yCursor    = 0.0f;
     float        xCursorMax = 0.0f;
-    const iBool  isMonospaced = d->isMonospaced;
+    const iBool  isMonospaced = isMonospaced_Font(d);
     iWrapText *wrap = args->wrap;
     iAssert(args->text.end >= args->text.start);
     /* Split the text into a number of attributed runs that specify exactly which
diff --git a/src/ui/text.h b/src/ui/text.h
index 1b3200d4..f76c8125 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -31,79 +31,92 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 /* Content sizes: regular (1x) -> medium (1.2x) -> big (1.33x) -> large (1.67x) -> huge (2x) */
 
+#define FONT_ID(name, style, size)    ((name) + ((style) * max_FontSize) + (size))
+
 enum iFontId {
-    /* UI fonts: normal weight (1x, 1.125x, 1.33x, 1.67x) */
-    default_FontId = 0,
-    defaultMedium_FontId,
-    defaultBig_FontId,
-    defaultLarge_FontId,
-    defaultTiny_FontId,
-    defaultSmall_FontId,
+    default_FontId         = 0,                    /* default is always the first font */
+    monospace_FontId       = maxVariants_Fonts,     /* 2nd font is always the monospace font */
+    documentBody_FontId    = maxVariants_Fonts * 2, /* 3rd font is the body font */
+    documentHeading_FontId = maxVariants_Fonts * 3, /* heading font */
+    auxiliary_FontId       = maxVariants_Fonts * 4, /* the first auxiliary font (e.g., symbols) */
+
+    //    defaultMedium_FontId,
+//    defaultBig_FontId,
+//    defaultLarge_FontId,
+//    defaultTiny_FontId,
+//    defaultSmall_FontId,
     /* UI fonts: bold weight */
-    defaultBold_FontId,
-    defaultMediumBold_FontId,
-    defaultBigBold_FontId,
-    defaultLargeBold_FontId,
+//    defaultBold_FontId,
+//    defaultMediumBold_FontId,
+//    defaultBigBold_FontId,
+//    defaultLargeBold_FontId,
     /* content fonts */
-    regular_FontId,
-    bold_FontId,
-    italic_FontId,
-    medium_FontId,
-    big_FontId,
-    largeBold_FontId,
-    largeLight_FontId,
-    hugeBold_FontId,
-    monospaceSmall_FontId,
-    monospace_FontId,
+//    bold_FontId,
+//    italic_FontId,
+//    medium_FontId,
+//    big_FontId,
+//    largeBold_FontId,
+//    largeLight_FontId,
+//    hugeBold_FontId,
+//    monospaceSmall_FontId,
     /* extra content fonts */
-    defaultContentRegular_FontId, /* UI font but sized to regular_FontId */
-    defaultContentSmall_FontId, /* UI font but sized smaller */
+//    defaultContentRegular_FontId, /* UI font but sized to regular_FontId */
+//    defaultContentSmall_FontId, /* UI font but sized smaller */
     /* symbols and scripts */
-    userSymbols_FontId,
-    iosevka_FontId           = userSymbols_FontId + max_FontSize,
-    symbols_FontId           = iosevka_FontId + max_FontSize,
-    symbols2_FontId          = symbols_FontId + max_FontSize,
-    smolEmoji_FontId         = symbols2_FontId + max_FontSize,
-    notoEmoji_FontId         = smolEmoji_FontId + max_FontSize,
-    japanese_FontId          = notoEmoji_FontId + max_FontSize,
-    chineseSimplified_FontId = japanese_FontId + max_FontSize,
-    korean_FontId            = chineseSimplified_FontId + max_FontSize,
-    arabic_FontId            = korean_FontId + max_FontSize,
-    max_FontId               = arabic_FontId + max_FontSize,
+//    userSymbols_FontId,
+//    iosevka_FontId           = userSymbols_FontId + max_FontSize,
+//    symbols_FontId           = iosevka_FontId + max_FontSize,
+//    symbols2_FontId          = symbols_FontId + max_FontSize,
+//    smolEmoji_FontId         = symbols2_FontId + max_FontSize,
+//    notoEmoji_FontId         = smolEmoji_FontId + max_FontSize,
+//    japanese_FontId          = notoEmoji_FontId + max_FontSize,
+//    chineseSimplified_FontId = japanese_FontId + max_FontSize,
+//    korean_FontId            = chineseSimplified_FontId + max_FontSize,
+//    arabic_FontId            = korean_FontId + max_FontSize,
+//    max_FontId               = arabic_FontId + max_FontSize,
 
     /* Meta: */
-    mask_FontId               = 0xffff,
-    alwaysVariableFlag_FontId = 0x10000,
+    mask_FontId               = 0x0000ffff, /* font IDs are 16-bit; see GmRun's packing */
+    alwaysVariableFlag_FontId = 0x00010000,
 
     /* UI fonts: */
-    uiLabel_FontId          = default_FontId,
-    uiLabelBold_FontId      = defaultBold_FontId,
-    uiLabelLarge_FontId     = defaultLarge_FontId,
-    uiLabelLargeBold_FontId = defaultLargeBold_FontId,
-    uiShortcuts_FontId      = default_FontId,
-    uiInput_FontId          = defaultMedium_FontId,
-    uiContent_FontId        = defaultMedium_FontId,
-    uiContentBold_FontId    = defaultMediumBold_FontId,
-    uiContentSymbols_FontId = symbols_FontId + uiMedium_FontSize,    
+    uiLabelTiny_FontId       = FONT_ID(default_FontId, semiBold_FontStyle, uiTiny_FontSize),
+    uiLabelSmall_FontId      = FONT_ID(default_FontId, regular_FontStyle,  uiSmall_FontSize),
+    uiLabel_FontId           = FONT_ID(default_FontId, regular_FontStyle,  uiNormal_FontSize),
+    uiLabelMedium_FontId     = FONT_ID(default_FontId, regular_FontStyle,  uiMedium_FontSize),
+    uiLabelMediumBold_FontId = FONT_ID(default_FontId, bold_FontStyle,     uiMedium_FontSize),
+    uiLabelBig_FontId        = FONT_ID(default_FontId, regular_FontStyle,  uiBig_FontSize),
+    uiLabelBold_FontId       = FONT_ID(default_FontId, bold_FontStyle,     uiNormal_FontSize),
+    uiLabelBigBold_FontId    = FONT_ID(default_FontId, bold_FontStyle,     uiBig_FontSize),
+    uiLabelLarge_FontId      = FONT_ID(default_FontId, regular_FontStyle,  uiLarge_FontSize),
+    uiLabelLargeBold_FontId  = FONT_ID(default_FontId, bold_FontStyle,     uiLarge_FontSize),
+    uiLabelSymbols_FontId    = FONT_ID(auxiliary_FontId, regular_FontStyle, uiNormal_FontSize),
+    uiShortcuts_FontId       = FONT_ID(default_FontId, regular_FontStyle,  uiNormal_FontSize),
+    uiInput_FontId           = FONT_ID(default_FontId, regular_FontStyle,  uiMedium_FontSize),
+    uiContent_FontId         = FONT_ID(default_FontId, regular_FontStyle,  uiMedium_FontSize),
+    uiContentBold_FontId     = FONT_ID(default_FontId, bold_FontStyle,     uiMedium_FontSize),
+    uiContentSymbols_FontId  = FONT_ID(auxiliary_FontId, regular_FontStyle, uiMedium_FontSize),
     /* Document fonts: */
-    paragraph_FontId         = regular_FontId,
-    firstParagraph_FontId    = medium_FontId,
-    preformatted_FontId      = monospace_FontId,
-    preformattedSmall_FontId = monospaceSmall_FontId,
-    quote_FontId             = italic_FontId,
-    heading1_FontId          = hugeBold_FontId,
-    heading2_FontId          = largeBold_FontId,
-    heading3_FontId          = big_FontId,
-    banner_FontId            = largeLight_FontId,
-    regularMonospace_FontId  = iosevka_FontId + contentRegular_FontSize    
+    paragraph_FontId         = FONT_ID(documentBody_FontId,    regular_FontStyle, contentRegular_FontSize),
+    bold_FontId              = FONT_ID(documentBody_FontId,    semiBold_FontStyle, contentRegular_FontSize),
+    firstParagraph_FontId    = FONT_ID(documentBody_FontId,    regular_FontStyle, contentMedium_FontSize),
+    preformatted_FontId      = FONT_ID(monospace_FontId,       regular_FontStyle, contentMono_FontSize),
+    preformattedSmall_FontId = FONT_ID(monospace_FontId,       regular_FontStyle, contentMonoSmall_FontSize),
+    quote_FontId             = FONT_ID(documentBody_FontId,    italic_FontStyle,  contentRegular_FontSize),
+    heading1_FontId          = FONT_ID(documentHeading_FontId, bold_FontStyle,    contentHuge_FontSize),
+    heading2_FontId          = FONT_ID(documentHeading_FontId, bold_FontStyle,    contentLarge_FontSize),
+    heading3_FontId          = FONT_ID(documentHeading_FontId, regular_FontStyle, contentBig_FontSize),
+    banner_FontId            = FONT_ID(documentHeading_FontId, light_FontStyle,   contentLarge_FontSize),
+    regularMonospace_FontId  = FONT_ID(monospace_FontId,       regular_FontStyle, contentRegular_FontSize),
 };
 
-iLocalDef iBool isJapanese_FontId(enum iFontId id) {
-    return id >= japanese_FontId && id < japanese_FontId + max_FontSize;
-}
+//iLocalDef iBool isJapanese_FontId(enum iFontId id) {
+//    return id >= japanese_FontId && id < japanese_FontId + max_FontSize;
+//}
 
 #define emojiVariationSelector_Char     ((iChar) 0xfe0f)
 
+/* TODO: get rid of this; configure using font ID strings, check RTL from FontFile flags */
 enum iTextFont {
     undefined_TextFont = -1,
     nunito_TextFont = 0,
@@ -127,7 +140,7 @@ void    deinit_Text             (iText *);
 
 void    setCurrent_Text         (iText *);
 
-void    loadUserFonts_Text      (void); /* based on Prefs */
+//void    loadUserFonts_Text      (void); /* based on Prefs */
 
 void    setContentFont_Text     (iText *, enum iTextFont font);
 void    setHeadingFont_Text     (iText *, enum iTextFont font);
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index ba7545fd..ded8d7f8 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -255,7 +255,7 @@ void init_UploadWidget(iUploadWidget *d) {
         setFlags_Widget(as_Widget(d->token), expand_WidgetFlag, iTrue);
         setFocus_Widget(as_Widget(d->input));
     }
-    setFont_InputWidget(d->input, iosevka_FontId);
+    setFont_InputWidget(d->input, FONT_ID(monospace_FontId, regular_FontStyle, uiNormal_FontSize));
     setUseReturnKeyBehavior_InputWidget(d->input, iFalse); /* traditional text editor */
     setLineLimits_InputWidget(d->input, 7, 20);
     setHint_InputWidget(d->input, "${hint.upload.text}");
diff --git a/src/ui/util.c b/src/ui/util.c
index adca6269..a4411ea5 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -873,7 +873,7 @@ static void updateMenuItemFonts_Widget_(iWidget *d) {
             }
             else if (isPortraitPhone) {
                 if (!isSlidePanel) {
-                    setFont_LabelWidget(label, isCaution ? defaultBigBold_FontId : defaultBig_FontId);
+                    setFont_LabelWidget(label, isCaution ? uiLabelBigBold_FontId : uiLabelBig_FontId);
                 }
             }
             else {
@@ -1626,8 +1626,8 @@ iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
     }
     int fonts[2] = { uiLabel_FontId, uiLabelBold_FontId };
     if (deviceType_App() == phone_AppDeviceType) {
-        fonts[0] = defaultMedium_FontId;
-        fonts[1] = defaultMediumBold_FontId;
+        fonts[0] = uiLabelMedium_FontId;
+        fonts[1] = uiLabelMediumBold_FontId;
     }
     for (size_t i = 0; i < numActions; i++) {
         const char *label     = actions[i].label;
@@ -1694,7 +1694,7 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
                                                resizeToParentWidth_WidgetFlag);
     setContentPadding_InputWidget(input, 0.5f * gap_UI, 0.5f * gap_UI);
     if (deviceType_App() == phone_AppDeviceType) {
-        setFont_InputWidget(input, defaultBig_FontId);
+        setFont_InputWidget(input, uiLabelBig_FontId);
         setBackgroundColor_Widget(dlg, uiBackgroundSidebar_ColorId);
         setContentPadding_InputWidget(input, gap_UI, gap_UI);
     }
@@ -1811,7 +1811,7 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg,
                                  resizeToParentWidth_WidgetFlag |
                                  (first == '&' ? selected_WidgetFlag : 0));
             if (deviceType_App() != desktop_AppDeviceType) {
-                setFont_LabelWidget(option, defaultBig_FontId);
+                setFont_LabelWidget(option, uiLabelBig_FontId);
             }
         }
     }
diff --git a/src/ui/window.c b/src/ui/window.c
index 686a6dd6..ea783331 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1188,7 +1188,7 @@ void draw_Window(iWindow *d) {
         extern int drawCount_;
         drawRoot_Widget(root->widget);
 #if !defined (NDEBUG)
-        draw_Text(defaultBold_FontId, safeRect_Root(root).pos, red_ColorId, "%d", drawCount_);
+        draw_Text(uiLabelBold_FontId, safeRect_Root(root).pos, red_ColorId, "%d", drawCount_);
         drawCount_ = 0;
 #endif
     }
@@ -1287,7 +1287,7 @@ void draw_MainWindow(iMainWindow *d) {
         }
         setCurrent_Root(NULL);
 #if !defined (NDEBUG)
-        draw_Text(defaultBold_FontId, safeRect_Root(w->roots[0]).pos, red_ColorId, "%d", drawCount_);
+        draw_Text(uiLabelBold_FontId, safeRect_Root(w->roots[0]).pos, red_ColorId, "%d", drawCount_);
         drawCount_ = 0;
 #endif
     }