Font configuration; Prefs has a string value array

Added a second version of Iosevka with more line spacing, to be used as the default monospace document font.

6 files changed, 137 insertions, 140 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 2ba2fa12..45a8cf2d 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -496,7 +496,7 @@ static int documentWidth_DocumentWidget_(const iDocumentWidget *d) {
                                      -1.0f, 10.0f); /* adapt to width */
     //printf("%f\n", adjust); fflush(stdout);
     return iMini(iMax(minWidth, bounds.size.x - gap_UI * (d->pageMargin + adjust) * 2),
-                 fontSize_UI * emRatio_Text(paragraph_FontId) * /* dependent on avg. glyph width */
+                 fontSize_UI * //emRatio_Text(paragraph_FontId) * /* dependent on avg. glyph width */
                  prefs->lineWidth * prefs->zoomPercent / 100);
 }
 
@@ -3441,7 +3441,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     return iTrue;
                 }
                 break;
-#if 1
+#if !defined (NDEBUG)
             case SDLK_KP_1:
             case '`': {
                 iBlock *seed = new_Block(64);
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index cfc81863..9713e1f2 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -384,7 +384,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
     }
     else if (flags & alignLeft_WidgetFlag) {
         draw_Text(d->font, add_I2(bounds.pos, addX_I2(padding_LabelWidget_(d, 0), iconPad)),
-                  fg, cstr_String(&d->label));
+                  fg, "%s", cstr_String(&d->label));
         if ((flags & drawKey_WidgetFlag) && d->key) {
             iString str;
             init_String(&str);
@@ -399,6 +399,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
                            : colorEscape != none_ColorId ? colorEscape
                                                       : uiTextShortcut_ColorId,*/
                            right_Alignment,
+                           "%s",
                            cstr_String(&str));
             deinit_String(&str);
         }
@@ -409,6 +410,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
             add_I2(topRight_Rect(bounds), negX_I2(padding_LabelWidget_(d, 1))),
             fg,
             right_Alignment,
+            "%s",
             cstr_String(&d->label));
     }
     else {
diff --git a/src/ui/root.c b/src/ui/root.c
index a2e6062f..f6d6f11d 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -566,7 +566,8 @@ static iBool willPerformSearchQuery_(const iString *userInput) {
     if (isEmpty_String(clean)) {
         return iFalse;
     }
-    return !isEmpty_String(&prefs_App()->searchUrl) && !isLikelyUrl_String(userInput);
+    return !isEmpty_String(&prefs_App()->strings[searchUrl_PrefsString]) &&
+           !isLikelyUrl_String(userInput);
 }
 
 static void updateUrlInputContentPadding_(iWidget *navBar) {
diff --git a/src/ui/text.c b/src/ui/text.c
index 8adfa019..14b4e305 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -171,7 +171,8 @@ iLocalDef iBool isMonospaced_Font(const iFont *d) {
 static iFont *font_Text_(enum iFontId id);
 
 static void init_Font(iFont *d, const iFontSpec *fontSpec, const iFontFile *fontFile,
-                      enum iFontSize sizeId, int height) {
+                      enum iFontSize sizeId, float height) {
+    const int scaleType = scaleType_FontSpec(sizeId);
     d->fontSpec = fontSpec;
     d->fontFile = fontFile;
     /* TODO: Nunito kerning fixes need to be a font parameter of its own. */
@@ -197,15 +198,9 @@ static void init_Font(iFont *d, const iFontSpec *fontSpec, const iFontFile *font
         d->family = emojiAndSymbols_TextFont;
     }
 #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);
-    const float scale = fontSpec->scaling;
-    d->xScale = d->yScale = scaleForPixelHeight_FontFile(fontFile, height) * scale;
+    d->height = (int) (height * fontSpec->heightScale[scaleType]);
+    const float glyphScale = fontSpec->glyphScale[scaleType];
+    d->xScale = d->yScale = scaleForPixelHeight_FontFile(fontFile, d->height) * glyphScale;
     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
@@ -217,8 +212,9 @@ static void init_Font(iFont *d, const iFontSpec *fontSpec, const iFontFile *font
     }
     d->emAdvance  = fontFile->emAdvance * d->xScale;
     d->baseline   = fontFile->ascent * d->yScale;
-    d->vertOffset = height * (1.0f - scale) / 2 * fontSpec->vertOffset;
+    d->vertOffset = d->height * (1.0f - glyphScale) / 2 * fontSpec->vertOffsetScale[scaleType];
     d->table = NULL;
+ //   printf("{%s} height:%d baseline:%d\n", cstr_String(&d->fontSpec->id), d->height, d->baseline);
 }
 
 static void deinit_Font(iFont *d) {
@@ -252,8 +248,8 @@ struct Impl_CacheRow {
 };
 
 struct Impl_Text {
-    enum iTextFont contentFont;
-    enum iTextFont headingFont;
+//    enum iTextFont contentFont;
+//    enum iTextFont headingFont;
     float          contentFontSize;
     iArray         fonts; /* fonts currently selected for use (incl. all styles/sizes) */
     int            overrideFontId; /* always checked for glyphs first, regardless of which font is used */
@@ -290,7 +286,8 @@ static void setupFontVariants_Text_(iText *d, const iFontSpec *spec, int baseId)
                       spec,
                       spec->styles[style],
                       sizeId,
-                      (sizeId < contentRegular_FontSize ? uiSize : textSize) * scale_FontSize(sizeId));
+                      (sizeId < contentRegular_FontSize ? uiSize : textSize) *
+                          scale_FontSize(sizeId));
         }
     }
 }
@@ -311,6 +308,11 @@ iLocalDef enum iFontStyle styleId_Text_(const iFont *d) {
     return (fontId_Text_(d) / max_FontSize) % max_FontStyle;
 }
 
+static const iFontSpec *tryFindSpec_(enum iPrefsString ps, const char *fallback) {
+    const iFontSpec *spec = findSpec_Fonts(cstr_String(&prefs_App()->strings[ps]));
+    return spec ? spec : findSpec_Fonts(fallback);
+}
+
 static void initFonts_Text_(iText *d) {
 #if 0
     const iBlock *regularFont   = &fontNunitoRegular_Embedded;
@@ -445,11 +447,11 @@ static void initFonts_Text_(iText *d) {
     /* 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);
+    setupFontVariants_Text_(d, tryFindSpec_(uiFont_PrefsString, "default"), default_FontId);
+    setupFontVariants_Text_(d, tryFindSpec_(monospaceFont_PrefsString, "iosevka"), monospace_FontId);
+    setupFontVariants_Text_(d, tryFindSpec_(headingFont_PrefsString, "default"), documentHeading_FontId);
+    setupFontVariants_Text_(d, tryFindSpec_(bodyFont_PrefsString, "default"), documentBody_FontId);
+    setupFontVariants_Text_(d, tryFindSpec_(monospaceDocumentFont_PrefsString, "iosevka-body"), documentMonospace_FontId);
     /* Check if there are auxiliary fonts available and set those up, too. */
     iConstForEach(PtrArray, s, listSpecsByPriority_Fonts()) {
         const iFontSpec *spec = s.ptr;
@@ -459,17 +461,6 @@ static void initFonts_Text_(iText *d) {
             setupFontVariants_Text_(d, spec, fontId);
         }
     }
-#if 0
-    iForIndices(i, fontData) {
-        iFont *font = font_Text_(i);
-        init_Font(font,
-                  fontData[i].ttf,
-                  fontData[i].size,
-                  fontData[i].scaling,
-                  fontData[i].sizeId,
-                  fontData[i].ttf == &fontIosevkaTermExtended_Embedded);
-    }
-#endif
     gap_Text = iRound(gap_UI * d->contentFontSize);
 }
 
@@ -544,8 +535,8 @@ void init_Text(iText *d, SDL_Renderer *render) {
     iText *oldActive = activeText_;
     activeText_ = d;
     init_Array(&d->fonts, sizeof(iFont));
-    d->contentFont     = nunito_TextFont;
-    d->headingFont     = nunito_TextFont;
+//    d->contentFont     = nunito_TextFont;
+//    d->headingFont     = nunito_TextFont;
     d->contentFontSize = contentScale_Text_;
     d->ansiEscape      = new_RegExp("[[()]([0-9;AB]*)m", 0);
     d->render          = render;
@@ -579,21 +570,15 @@ void setOpacity_Text(float opacity) {
     SDL_SetTextureAlphaMod(activeText_->cache, iClamp(opacity, 0.0f, 1.0f) * 255 + 0.5f);
 }
 
-void setContentFont_Text(iText *d, enum iTextFont font) {
-    if (d->contentFont != font) {
-        d->contentFont = font;
-        resetFonts_Text(d);
-    }
-}
-
-void setHeadingFont_Text(iText *d, enum iTextFont font) {
-    if (d->headingFont != font) {
-        d->headingFont = font;
-        resetFonts_Text(d);
-    }
-}
+//void setFont_Text(iText *d, int fontId, const char *fontSpecId) {
+//    setupFontVariants_Text_(d, findSpec_Fonts(fontSpecId), fontId);
+//    if (d->contentFont != font) {
+//        d->contentFont = font;
+//        resetFonts_Text(d);
+//    }
+//}
 
-void setContentFontSize_Text(iText *d, float fontSizeFactor) {
+void setDocumentFontSize_Text(iText *d, float fontSizeFactor) {
     fontSizeFactor *= contentScale_Text_;
     iAssert(fontSizeFactor > 0);
     if (iAbs(d->contentFontSize - fontSizeFactor) > 0.001f) {
diff --git a/src/ui/text.h b/src/ui/text.h
index af69795a..ac59e7c8 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -34,80 +34,49 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #define FONT_ID(name, style, size)    ((name) + ((style) * max_FontSize) + (size))
 
 enum iFontId {
-    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,
-    /* content fonts */
-//    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 */
-    /* 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,
+    default_FontId           = 0,                     /* default is always the first font */
+    monospace_FontId         = maxVariants_Fonts,     /* 2nd font is always the monospace font */
+    documentHeading_FontId   = maxVariants_Fonts * 2, /* heading font */
+    documentBody_FontId      = maxVariants_Fonts * 3, /* body font */
+    documentMonospace_FontId = maxVariants_Fonts * 4,
+    auxiliary_FontId         = maxVariants_Fonts * 5, /* the first auxiliary font (e.g., symbols) */
 
     /* Meta: */
     mask_FontId               = 0x0000ffff, /* font IDs are 16-bit; see GmRun's packing */
     alwaysVariableFlag_FontId = 0x00010000,
 
     /* UI fonts: */
-    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         = 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),
+    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          = 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,  contentSmall_FontSize),
+    preformattedSmall_FontId  = FONT_ID(monospace_FontId,         regular_FontStyle,  contentTiny_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),
+    monospaceParagraph_FontId = FONT_ID(documentMonospace_FontId, regular_FontStyle,  contentRegular_FontSize),
+    monospaceBold_FontId      = FONT_ID(documentMonospace_FontId, semiBold_FontStyle, contentRegular_FontSize),
+    plainText_FontId          = FONT_ID(documentMonospace_FontId, regular_FontStyle,  contentRegular_FontSize),
 };
 
 //iLocalDef iBool isJapanese_FontId(enum iFontId id) {
@@ -116,6 +85,7 @@ enum iFontId {
 
 #define emojiVariationSelector_Char     ((iChar) 0xfe0f)
 
+#if 0
 /* TODO: get rid of this; configure using font ID strings, check RTL from FontFile flags */
 enum iTextFont {
     undefined_TextFont = -1,
@@ -129,6 +99,7 @@ enum iTextFont {
     arabic_TextFont,
     emojiAndSymbols_TextFont,
 };
+#endif
 
 extern int gap_Text; /* affected by content font size */
 
@@ -140,11 +111,10 @@ void    deinit_Text             (iText *);
 
 void    setCurrent_Text         (iText *);
 
-//void    loadUserFonts_Text      (void); /* based on Prefs */
-
-void    setContentFont_Text     (iText *, enum iTextFont font);
-void    setHeadingFont_Text     (iText *, enum iTextFont font);
-void    setContentFontSize_Text (iText *, float fontSizeFactor); /* affects all except `default*` fonts */
+//void    setContentFont_Text     (iText *, enum iTextFont font);
+//void    setHeadingFont_Text     (iText *, enum iTextFont font);
+//void    setFont_Text            (iText *, int fontId, const char *fontSpecId);
+void    setDocumentFontSize_Text(iText *, float fontSizeFactor); /* affects all except `default*` fonts */
 void    resetFonts_Text         (iText *);
 
 int     lineHeight_Text         (int fontId);
diff --git a/src/ui/util.c b/src/ui/util.c
index ae72dbee..73193c7a 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1931,7 +1931,38 @@ static void addRadioButton_(iWidget *parent, const char *id, const char *label,
         id);
 }
 
+static iBool proportionalFonts_(const iFontSpec *spec) {
+    return (spec->flags & monospace_FontSpecFlag) == 0 && ~spec->flags & auxiliary_FontSpecFlag;
+}
+
+static iBool monospaceFonts_(const iFontSpec *spec) {
+    return (spec->flags & monospace_FontSpecFlag) != 0 && ~spec->flags & auxiliary_FontSpecFlag;
+}
+
 static const iArray *makeFontItems_(const char *id) {
+    iArray *items = collectNew_Array(sizeof(iMenuItem));
+    if (!startsWith_CStr(id, "mono")) {
+        iConstForEach(PtrArray, i, listSpecs_Fonts(proportionalFonts_)) {
+            const iFontSpec *spec = i.ptr;
+            pushBack_Array(
+                items,
+                &(iMenuItem){ cstr_String(&spec->name),
+                              0,
+                              0,
+                              format_CStr("!font.set %s:%s", id, cstr_String(&spec->id)) });
+        }
+        pushBack_Array(items, &(iMenuItem){ "---" });
+    }
+    iConstForEach(PtrArray, j, listSpecs_Fonts(monospaceFonts_)) {
+        const iFontSpec *spec = j.ptr;
+        pushBack_Array(
+            items,
+            &(iMenuItem){ cstr_String(&spec->name),
+                          0,
+                          0,
+                          format_CStr("!font.set %s:%s", id, cstr_String(&spec->id)) });
+    }
+#if 0
     const struct {
         const char *   name;
         enum iTextFont cfgId;
@@ -1943,7 +1974,6 @@ static const iArray *makeFontItems_(const char *id) {
                   { "Tinos", tinos_TextFont },
                   { "---", -1 },
                   { "Iosevka", iosevka_TextFont } };
-    iArray *items = collectNew_Array(sizeof(iMenuItem));
     iForIndices(i, fonts) {
         pushBack_Array(items,
                        &(iMenuItem){ fonts[i].name,
@@ -1953,17 +1983,19 @@ static const iArray *makeFontItems_(const char *id) {
                                          ? format_CStr("!%s.set arg:%d", id, fonts[i].cfgId)
                                          : NULL });
     }
+#endif
     pushBack_Array(items, &(iMenuItem){ NULL }); /* terminator */
     return items;
 }
 
 static void addFontButtons_(iWidget *parent, const char *id) {
     const iArray *items = makeFontItems_(id);
-    iLabelWidget *button = makeMenuButton_LabelWidget("Source Sans 3",
+    size_t widestIndex = findWidestLabel_MenuItem(constData_Array(items), size_Array(items));
+    iLabelWidget *button = makeMenuButton_LabelWidget(constValue_Array(items, widestIndex, iMenuItem).label,
                                                       constData_Array(items), size_Array(items));
     setBackgroundColor_Widget(findChild_Widget(as_Widget(button), "menu"),
                               uiBackgroundMenu_ColorId);
-    setId_Widget(as_Widget(button), format_CStr("prefs.%s", id));
+    setId_Widget(as_Widget(button), format_CStr("prefs.font.%s", id));
     addChildFlags_Widget(parent, iClob(button), alignLeft_WidgetFlag);
 }
 
@@ -2170,11 +2202,11 @@ iWidget *makePreferences_Widget(void) {
         { NULL }
     };
     const iMenuItem lineWidthItems[] = {
-        { "button id:prefs.linewidth.50 text:\u20132",                 0, 0, "linewidth.set arg:50" },
-        { "button id:prefs.linewidth.58 text:\u20131",                 0, 0, "linewidth.set arg:58" },
-        { "button id:prefs.linewidth.66 label:prefs.linewidth.normal", 0, 0, "linewidth.set arg:66" },
-        { "button id:prefs.linewidth.76 text:+1",                      0, 0, "linewidth.set arg:76" },
-        { "button id:prefs.linewidth.86 text:+2",                      0, 0, "linewidth.set arg:86" },
+        { "button id:prefs.linewidth.30 text:\u20132",                 0, 0, "linewidth.set arg:30" },
+        { "button id:prefs.linewidth.34 text:\u20131",                 0, 0, "linewidth.set arg:34" },
+        { "button id:prefs.linewidth.38 label:prefs.linewidth.normal", 0, 0, "linewidth.set arg:38" },
+        { "button id:prefs.linewidth.43 text:+1",                      0, 0, "linewidth.set arg:43" },
+        { "button id:prefs.linewidth.48 text:+2",                      0, 0, "linewidth.set arg:48" },
         { "button id:prefs.linewidth.1000 label:prefs.linewidth.fill", 0, 0, "linewidth.set arg:1000" },
         { NULL }
     };
@@ -2491,10 +2523,14 @@ 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.headingfont}")));
-            addFontButtons_(values, "headingfont");
-            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font}")));
-            addFontButtons_(values, "font");
+            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}")));
+            addFontButtons_(values, "body");
+            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(); {
@@ -2511,6 +2547,9 @@ iWidget *makePreferences_Widget(void) {
                 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");
+            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) */
@@ -2528,11 +2567,11 @@ iWidget *makePreferences_Widget(void) {
             }
             addChildFlags_Widget(values, iClob(boldLink), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
             addDialogPadding_(headings, values);
-            /* Custom font. */ {
-                iInputWidget *customFont = new_InputWidget(0);
-                setHint_InputWidget(customFont, "${hint.prefs.userfont}");
-                addPrefsInputWithHeading_(headings, values, "prefs.userfont", iClob(customFont));
-            }
+//            /* Custom font. */ {
+//                iInputWidget *customFont = new_InputWidget(0);
+//                setHint_InputWidget(customFont, "${hint.prefs.userfont}");
+//                addPrefsInputWithHeading_(headings, values, "prefs.userfont", iClob(customFont));
+//            }
         }        
     }
     /* Style. */ {