14 files changed, 90 insertions, 82 deletions

diff --git a/.github/workflows/docker-debian/entrypoint.sh b/.github/workflows/docker-debian/entrypoint.sh
index d3222c3f..33e59c44 100755
--- a/.github/workflows/docker-debian/entrypoint.sh
+++ b/.github/workflows/docker-debian/entrypoint.sh
@@ -2,7 +2,7 @@
 export LC_ALL=en_US.UTF-8
 
 apt-get update -qq -y
-apt-get install -y -qq --no-install-recommends cmake libsdl2-dev libssl-dev libpcre3-dev zlib1g-dev libunistring-dev libmpg123-dev debhelper dh-make devscripts fakeroot git build-essential locales python3 python3-pip libharfbuzz-dev libfribidi-dev
+apt-get install -y -qq --no-install-recommends cmake libsdl2-dev libssl-dev libpcre3-dev zlib1g-dev libunistring-dev libmpg123-dev debhelper dh-make devscripts fakeroot git build-essential locales python3 python3-pip zip libharfbuzz-dev libfribidi-dev
 pip3 install git-archive-all
 sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen && locale-gen
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6abfd094..378a1bba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
 cmake_minimum_required (VERSION 3.9)
 
 project (Lagrange
-    VERSION 1.8.0
+    VERSION 1.8.1
     DESCRIPTION "A Beautiful Gemini Client"
     LANGUAGES C
 )
@@ -65,25 +65,6 @@ include (Depends.cmake)
 # Package resources.
 message (STATUS "Preparing resources...")
 make_fontpack (res/default.fontpack)
-# Fonts to install as separate files.
-set (FONTPACKS
-#    arabic.fontpack
-#    cjk.fontpack
-#    firasans.fontpack
-#    literata.fontpack
-#    nunito.fontpack
-#    tinos.fontpack      
-)
-foreach (fp ${FONTPACKS})
-    make_fontpack (res/${fp})
-    set_source_files_properties (${CMAKE_BINARY_DIR}/${fp} 
-        PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-endforeach (fp)
-macro (install_fonts dst)
-    foreach (fp ${FONTPACKS})
-        install (FILES ${CMAKE_BINARY_DIR}/${fp} DESTINATION ${dst})
-    endforeach (fp)
-endmacro ()
 set (EMBED_RESOURCES
     res/about/about.gmi
     res/about/help.gmi
@@ -240,11 +221,6 @@ set (SOURCES
     ${CMAKE_CURRENT_BINARY_DIR}/embedded.h
     ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr
 )
-if (APPLE)
-    foreach (fp ${FONTPACKS})
-        list (APPEND SOURCES ${CMAKE_BINARY_DIR}/${fp})
-    endforeach (fp)
-endif ()
 if (ENABLE_IPC)
     list (APPEND SOURCES
         src/ipc.c
@@ -444,7 +420,6 @@ if (MSYS)
     if (NOT ENABLE_RESOURCE_EMBED)
         install (FILES ${EMB_BIN} DESTINATION .)
     endif ()
-    install_fonts (.)
     install (PROGRAMS
         ${SDL2_LIBDIR}/SDL2.dll
         res/urlopen.bat
@@ -460,7 +435,6 @@ elseif (HAIKU)
             LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr")
         install (FILES ${EMB_BIN} DESTINATION .)
     endif ()
-    install_fonts (.)
 elseif (UNIX AND NOT APPLE)
     set_target_properties (app PROPERTIES
         INSTALL_RPATH_USE_LINK_PATH YES
@@ -493,5 +467,4 @@ MimeType=x-scheme-handler/gemini;x-scheme-handler/gopher;
         endif ()
         install (FILES ${EMB_BIN} DESTINATION share/lagrange)
     endif ()
-    install_fonts (share/lagrange)
 endif ()
diff --git a/lib/the_Foundation b/lib/the_Foundation
-Subproject 6c7d2a3b050aae3b37adc626aa75f040b5acb93
+Subproject 9554ca7cc8b26c328d870760f3aaac4e701ba7e
diff --git a/res/about/version.gmi b/res/about/version.gmi
index f4fb83d1..372f6027 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,6 +6,14 @@
 ```
 # Release notes
 
+## 1.8.1
+* Added the `zip` utility as a build requirement. It is used for making fontpacks.
+* Fixed build failure with the simple text renderer, i.e., when HarfBuzz is disabled.
+* Fixed a line spacing artifact in long headings. With some fonts, the lines were clipping each other so the spacing was restored to normal.
+* Fixed a socket I/O issue that caused received data to be ignored when the peer closed the connection prematurely.
+* macOS: Tab close buttons are on the left side (platform UI convention).
+* Gopher: Recognize both LF and CRLF line endings in page content.
+
 ## 1.8
 ⚠️ Font settings will be reset to defaults. Only a minimal set of fonts is bundled with the app. If additional fonts are needed, one can use custom TrueType fonts or download some from the Font Library:
 => gemini://skyjake.fi/fonts/
diff --git a/src/app.c b/src/app.c
index 73771609..63a286f8 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2125,6 +2125,12 @@ void resetFonts_App(void) {
     }
 }
 
+static void invalidateCachedDocuments_App_(void) {
+    iForEach(ObjectList, i, iClob(listDocuments_App(NULL))) {
+        invalidateCachedLayout_History(history_DocumentWidget(i.object));
+    }
+}
+
 iBool handleCommand_App(const char *cmd) {
     iApp *d = &app_;
     const iBool isFrozen = !d->window || d->window->isDrawFrozen;
@@ -2289,7 +2295,10 @@ iBool handleCommand_App(const char *cmd) {
         if (!isFrozen) {
             setFreezeDraw_MainWindow(get_MainWindow(), iTrue); /* no intermediate draws before docs updated */
         }
-        d->prefs.zoomPercent = arg_Command(cmd);
+        if (arg_Command(cmd) != d->prefs.zoomPercent) {
+            d->prefs.zoomPercent = arg_Command(cmd);
+            invalidateCachedDocuments_App_();
+        }
         setDocumentFontSize_Text(text_Window(d->window), (float) d->prefs.zoomPercent / 100.0f);
         if (!isFrozen) {
             postCommand_App("font.changed");
@@ -2306,6 +2315,7 @@ iBool handleCommand_App(const char *cmd) {
             delta /= 2;
         }
         d->prefs.zoomPercent = iClamp(d->prefs.zoomPercent + delta, 50, 200);
+        invalidateCachedDocuments_App_();
         setDocumentFontSize_Text(text_Window(d->window), (float) d->prefs.zoomPercent / 100.0f);
         if (!isFrozen) {
             postCommand_App("font.changed");
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 8b24ce29..0027bdb3 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -161,10 +161,9 @@ struct Impl_GmDocument {
     iInt2     size;
     int       outsideMargin;
     iBool     enableCommandLinks; /* `about:command?` only allowed on selected pages */
+    iBool     isLayoutInvalidated;
     iArray    layout; /* contents of source, laid out in document space */
     iPtrArray links;
-//    enum iGmDocumentBanner bannerType;
-//    iString   bannerText;
     iString   title; /* the first top-level title */
     iArray    headings;
     iArray    preMeta; /* metadata about preformatted blocks */
@@ -607,6 +606,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
 //    const iBool   isDarkBg          = isDark_GmDocumentTheme(
 //        isDark_ColorTheme(colorTheme_App()) ? prefs->docThemeDark : prefs->docThemeLight);
     initTheme_GmDocument_(d);
+    d->isLayoutInvalidated = iFalse;
     /* TODO: Collect these parameters into a GmTheme. */
     float indents[max_GmLineType] = { 5, 10, 5, isNarrow ? 5 : 10, 0, 0, 0, 5 };
     if (isExtremelyNarrow) {
@@ -968,6 +968,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                                        ? 4 : 0) * gap_Text;
             }
             if (!isMono) {
+#if 0
                 /* Upper-level headings are typeset a bit tighter. */
                 if (type == heading1_GmLineType) {
                     rts.lineHeightReduction = 0.10f;
@@ -975,6 +976,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                 else if (type == heading2_GmLineType) {
                     rts.lineHeightReduction = 0.06f;
                 }
+#endif
                 /* Visited links are never bold. */
                 if (run.linkId && !prefs->boldLinkVisited &&
                     linkFlags_GmDocument(d, run.linkId) & visited_GmLinkFlag) {
@@ -1142,13 +1144,12 @@ void init_GmDocument(iGmDocument *d) {
     init_String(&d->source);
     init_String(&d->url);
     init_String(&d->localHost);
-//    d->bannerType = siteDomain_GmDocumentBanner;
     d->outsideMargin = 0;
     d->size = zero_I2();
     d->enableCommandLinks = iFalse;
+    d->isLayoutInvalidated = iFalse;
     init_Array(&d->layout, sizeof(iGmRun));
     init_PtrArray(&d->links);
-//    init_String(&d->bannerText);
     init_String(&d->title);
     init_Array(&d->headings, sizeof(iGmHeading));
     init_Array(&d->preMeta, sizeof(iGmPreMeta));
@@ -1164,7 +1165,6 @@ void init_GmDocument(iGmDocument *d) {
 void deinit_GmDocument(iGmDocument *d) {
     iReleasePtr(&d->openURLs);
     delete_Media(d->media);
-//    deinit_String(&d->bannerText);
     deinit_String(&d->title);
     clearLinks_GmDocument_(d);
     deinit_PtrArray(&d->links);
@@ -1720,22 +1720,28 @@ void setFormat_GmDocument(iGmDocument *d, enum iSourceFormat format) {
     d->format = format;
 }
 
-#if 0
-void setBanner_GmDocument(iGmDocument *d, enum iGmDocumentBanner type) {
-    d->bannerType = type;
+void setWidth_GmDocument(iGmDocument *d, int width, int canvasWidth) {
+    d->size.x        = width;
+    d->outsideMargin = iMax(0, (canvasWidth - width) / 2); /* distance to edge of the canvas */
+    doLayout_GmDocument_(d); /* TODO: just flag need-layout and do it later */
 }
-#endif
 
-void setWidth_GmDocument(iGmDocument *d, int width, int outsideMargin) {
-    d->size.x = width;
-    d->outsideMargin = outsideMargin; /* distance to edge of the viewport */
-    doLayout_GmDocument_(d); /* TODO: just flag need-layout and do it later */
+iBool updateWidth_GmDocument(iGmDocument *d, int width, int canvasWidth) {
+    if (d->size.x != width || d->isLayoutInvalidated) {
+        setWidth_GmDocument(d, width, canvasWidth);
+        return iTrue;
+    }
+    return iFalse;
 }
 
 void redoLayout_GmDocument(iGmDocument *d) {
     doLayout_GmDocument_(d);
 }
 
+void invalidateLayout_GmDocument(iGmDocument *d) {
+    d->isLayoutInvalidated = iTrue;
+}
+
 static void markLinkRunsVisited_GmDocument_(iGmDocument *d, const iIntSet *linkIds) {
     iForEach(Array, r, &d->layout) {
         iGmRun *run = r.value;
@@ -2080,7 +2086,7 @@ static void convertMarkdownToGemtext_GmDocument_(iGmDocument *d) {
     d->format = gemini_SourceFormat;
 }
 
-void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int outsideMargin,
+void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int canvasWidth,
                           enum iGmDocumentUpdate updateType) {
     /* TODO: This API has been set up to allow partial/progressive updating of the content.
        Currently the entire source is replaced every time, though. */
@@ -2122,7 +2128,7 @@ void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int
     if (isNormalized_GmDocument_(d)) {
         normalize_GmDocument(d);
     }
-    setWidth_GmDocument(d, width, outsideMargin); /* re-do layout */
+    setWidth_GmDocument(d, width, canvasWidth); /* re-do layout */
 }
 
 void foldPre_GmDocument(iGmDocument *d, uint16_t preId) {
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 444520c6..58fc3db3 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -120,10 +120,8 @@ enum iGmRunFlags {
     decoration_GmRunFlag  = iBit(1), /* not part of the source */
     startOfLine_GmRunFlag = iBit(2),
     endOfLine_GmRunFlag   = iBit(3),
-//    siteBanner_GmRunFlag  = iBit(4), /* area reserved for the site banner */
     quoteBorder_GmRunFlag = iBit(5),
     wide_GmRunFlag        = iBit(6), /* horizontally scrollable */
-//    footer_GmRunFlag      = iBit(7),
     altText_GmRunFlag     = iBit(8),
 };
 
@@ -177,13 +175,6 @@ enum iGmDocumentWarning {
     missingGlyphs_GmDocumentWarning = iBit(2),
 };
 
-/*
-enum iGmDocumentBanner {
-    none_GmDocumentBanner,
-    siteDomain_GmDocumentBanner,
-    certificateWarning_GmDocumentBanner,
-};*/
-
 enum iGmDocumentUpdate {
     partial_GmDocumentUpdate, /* appending more content */
     final_GmDocumentUpdate,   /* process all lines, including the last one if not terminated */
@@ -191,12 +182,13 @@ enum iGmDocumentUpdate {
 
 void    setThemeSeed_GmDocument (iGmDocument *, const iBlock *seed);
 void    setFormat_GmDocument    (iGmDocument *, enum iSourceFormat format);
-//void    setBanner_GmDocument    (iGmDocument *, enum iGmDocumentBanner type);
-void    setWidth_GmDocument     (iGmDocument *, int width, int outsideMargin);
+void    setWidth_GmDocument     (iGmDocument *, int width, int canvasWidth);
+iBool   updateWidth_GmDocument  (iGmDocument *, int width, int canvasWidth);
 void    redoLayout_GmDocument   (iGmDocument *);
+void    invalidateLayout_GmDocument(iGmDocument *); /* will have to be redone later */
 iBool   updateOpenURLs_GmDocument(iGmDocument *);
 void    setUrl_GmDocument       (iGmDocument *, const iString *url);
-void    setSource_GmDocument    (iGmDocument *, const iString *source, int width, int outsideMargin,
+void    setSource_GmDocument    (iGmDocument *, const iString *source, int width, int canvasWidth,
                                  enum iGmDocumentUpdate updateType);
 void    foldPre_GmDocument      (iGmDocument *, uint16_t preId);
 
@@ -204,8 +196,6 @@ void    updateVisitedLinks_GmDocument   (iGmDocument *); /* check all links for
 void    invalidatePalette_GmDocument    (iGmDocument *);
 void    makePaletteGlobal_GmDocument    (const iGmDocument *); /* copies document colors to the global palette */
 
-//void    reset_GmDocument        (iGmDocument *); /* free images */
-
 typedef void (*iGmDocumentRenderFunc)(void *, const iGmRun *);
 
 iMedia *        media_GmDocument            (iGmDocument *);
@@ -219,10 +209,6 @@ const iGmRun *  renderProgressive_GmDocument(const iGmDocument *d, const iGmRun
                                              iRangei visRangeY, iGmDocumentRenderFunc render,
                                              void *context);
 iInt2           size_GmDocument             (const iGmDocument *);
-//const iGmRun *  siteBanner_GmDocument       (const iGmDocument *);
-//iBool           hasSiteBanner_GmDocument    (const iGmDocument *);
-//enum iGmDocumentBanner bannerType_GmDocument(const iGmDocument *);
-//const iString * bannerText_GmDocument       (const iGmDocument *);
 const iArray *  headings_GmDocument         (const iGmDocument *); /* array of GmHeadings */
 const iString * source_GmDocument           (const iGmDocument *);
 size_t          memorySize_GmDocument       (const iGmDocument *); /* bytes */
diff --git a/src/gopher.c b/src/gopher.c
index ac5fe560..008a7743 100644
--- a/src/gopher.c
+++ b/src/gopher.c
@@ -103,10 +103,10 @@ static iBool convertSource_Gopher_(iGopher *d) {
     for (;;) {
         /* Find the end of the line. */
         iRangecc line = { body.start, body.start };
-        while (line.end < body.end - 1 && !isCRLFLineTerminator_(line.end)) {
+        while (line.end < body.end - 1 && !isLineTerminator_(line.end)) {
             line.end++;
         }
-        if (line.end >= body.end - 1 || !isCRLFLineTerminator_(line.end)) {
+        if (line.end >= body.end - 1 || !isLineTerminator_(line.end)) {
             /* Not a complete line. More may be coming later. */
             break;
         }
diff --git a/src/history.c b/src/history.c
index 208c239d..7185912f 100644
--- a/src/history.c
+++ b/src/history.c
@@ -440,6 +440,17 @@ void clearCache_History(iHistory *d) {
     unlock_Mutex(d->mtx);
 }
 
+void invalidateCachedLayout_History(iHistory *d) {
+    lock_Mutex(d->mtx);
+    iForEach(Array, i, &d->recent) {
+        iRecentUrl *url = i.value;
+        if (url->cachedDoc) {
+            invalidateLayout_GmDocument(url->cachedDoc);
+        }
+    }
+    unlock_Mutex(d->mtx);
+}
+
 size_t pruneLeastImportant_History(iHistory *d) {
     size_t delta  = 0;
     size_t chosen = iInvalidPos;
diff --git a/src/history.h b/src/history.h
index 7dad72df..d3daae80 100644
--- a/src/history.h
+++ b/src/history.h
@@ -76,6 +76,7 @@ void        clearCache_History                  (iHistory *);
 size_t      pruneLeastImportant_History         (iHistory *);
 size_t      pruneLeastImportantMemory_History   (iHistory *);
 void        invalidateTheme_History             (iHistory *); /* theme has changed, cached contents need updating */
+void        invalidateCachedLayout_History      (iHistory *);
 
 iBool       atLatest_History            (const iHistory *);
 iBool       atOldest_History            (const iHistory *);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 79bfea7b..8c24d4a9 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1702,6 +1702,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
         }
         if (cachedDoc) {
             replaceDocument_DocumentWidget_(d, cachedDoc);
+            updateWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d), width_Widget(d));
         }
         else if (setSource) {
             setSource_DocumentWidget(d, &str);
@@ -2498,7 +2499,7 @@ static iBool updateDocumentWidthRetainingScrollPosition_DocumentWidget_(iDocumen
         /* TODO: First *fully* visible run? */
         voffset = visibleRange_DocumentWidget_(d).start - top_Rect(run->visBounds);
     }
-    setWidth_GmDocument(d->doc, newWidth, (width_Widget(d) - newWidth) / 2);
+    setWidth_GmDocument(d->doc, newWidth, width_Widget(d));
     setWidth_Banner(d->banner, newWidth);
     documentRunsInvalidated_DocumentWidget_(d);
     if (runLoc && !keepCenter) {
@@ -2734,6 +2735,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     }
     else if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "font.changed") ||
              equal_Command(cmd, "keyroot.changed")) {
+        if (equal_Command(cmd, "font.changed")) {
+            invalidateCachedLayout_History(d->mod.history);   
+        }
         /* Alt/Option key may be involved in window size changes. */
         setLinkNumberMode_DocumentWidget_(d, iFalse);
         d->phoneToolbar = findWidget_App("toolbar");
diff --git a/src/ui/text.c b/src/ui/text.c
index 09c01d46..46e355d7 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -2114,7 +2114,7 @@ iTextMetrics draw_WrapText(iWrapText *d, int fontId, iInt2 pos, int color) {
         const int width = d->mode == word_WrapTextMode
                               ? tryAdvance_Text(fontId, text, d->maxWidth, &endPos).x
                               : tryAdvanceNoWrap_Text(fontId, text, d->maxWidth, &endPos).x;
-        notify_WrapText_(d, endPos, 0, width, iFalse);
+        notify_WrapText_(d, endPos, (iTextAttrib){ .colorId = color }, 0, width);
         drawRange_Text(fontId, pos, color, (iRangecc){ text.start, endPos });
         text.start = endPos;
         pos.y += lineHeight_Text(fontId);
diff --git a/src/ui/text_simple.c b/src/ui/text_simple.c
index 8b1de64a..81fb94a5 100644
--- a/src/ui/text_simple.c
+++ b/src/ui/text_simple.c
@@ -61,6 +61,7 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
        and other non-complex LTR scripts. Composed glyphs are not supported (must rely on text
        being in a pre-composed form). This algorithm is used if HarfBuzz is not available. */
     const iInt2 orig        = args->pos;
+    iTextAttrib attrib      = { .colorId = args->color };
     iRect       bounds      = { orig, init_I2(0, d->height) };
     float       xpos        = orig.x;
     float       xposMax     = xpos;
@@ -86,7 +87,7 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
 //    }
     const iBool checkHitPoint = wrap && !isEqual_I2(wrap->hitPoint, zero_I2());
     const iBool checkHitChar  = wrap && wrap->hitChar;
-    const iBool isMonospaced  = d->isMonospaced && !(mode & alwaysVariableWidthFlag_RunMode);
+    const iBool isMonospaced  = isMonospaced_Font(d) && !(mode & alwaysVariableWidthFlag_RunMode);
     if (isMonospaced) {
         monoAdvance = glyph_Font_(d, 'M')->advance;
     }
@@ -166,7 +167,7 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
             /* TODO: Check out if `uc_wordbreak_property()` from libunistring can be used here. */
             if (ch == '\n') {
                 /* Notify about the wrap. */
-                if (!notify_WrapText_(wrap, chPos, 0, iMax(xpos, xposExtend) - orig.x, iFalse)) {
+                if (!notify_WrapText_(wrap, chPos, attrib, 0, iMax(xpos, xposExtend) - orig.x)) {
                     break;
                 }
                 lastWordEnd = NULL;
@@ -246,7 +247,7 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
                 wrapPos = iMin(wrapPos, args->text.end);
                 advance = wrapAdvance;
             }
-            if (!notify_WrapText_(wrap, wrapPos, 0, advance, iFalse)) {
+            if (!notify_WrapText_(wrap, wrapPos, attrib, 0, advance)) {
                 break;
             }
             lastWordEnd = NULL;
@@ -282,8 +283,7 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
         }
         /* Symbols and emojis are NOT monospaced, so must conform when the primary font
            is monospaced. Except with Japanese script, that's larger than the normal monospace. */
-        const iBool useMonoAdvance =
-            monoAdvance > 0 && !isJapanese_FontId(fontId_Text_(glyph->font));
+        const iBool useMonoAdvance = monoAdvance > 0; // && !isJapanese_FontId(fontId_Text_(glyph->font));
         const float advance = (useMonoAdvance && glyph->advance > 0 ? monoAdvance : glyph->advance);
         if (!isMeasuring_(mode) && ch != 0x20 /* don't bother rendering spaces */) {
             if (useMonoAdvance && dst.w > advance && glyph->font != d && !isEmoji) {
@@ -328,9 +328,9 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
             if (enableKerning_Text && next) {
                 const uint32_t nextGlyphIndex = glyphIndex_Font_(glyph->font, next);
                 int kern = stbtt_GetGlyphKernAdvance(
-                    &glyph->font->font, index_Glyph_(glyph), nextGlyphIndex);
+                    &glyph->font->fontFile->stbInfo, index_Glyph_(glyph), nextGlyphIndex);
                 /* Nunito needs some kerning fixes. */
-                if (glyph->font->family == nunito_TextFont) {
+                if (glyph->font->fontSpec->flags & fixNunitoKerning_FontSpecFlag) {
                     if (ch == 'W' && (next == 'i' || next == 'h')) {
                         kern = -30;
                     }
@@ -362,7 +362,7 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
             break;
         }
     }
-    notify_WrapText_(wrap, chPos, 0, xpos - orig.x, iFalse);
+    notify_WrapText_(wrap, chPos, attrib, 0, xpos - orig.x);
     if (checkHitChar && wrap->hitChar == args->text.end) {
         wrap->hitAdvance_out = sub_I2(init_I2(xpos, ypos), orig);
     }
diff --git a/src/ui/util.c b/src/ui/util.c
index 6d0453ff..8affa57e 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1023,11 +1023,13 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, int menuOpenFlags) {
     setFlags_Widget(d, commandOnMouseMiss_WidgetFlag, iTrue);
     setFlags_Widget(findChild_Widget(d, "menu.cancel"), disabled_WidgetFlag, iFalse);
     arrange_Widget(d); /* need to know the height */
+    iBool allowOverflow = iFalse;
     /* A vertical offset determined by a possible selected label in the menu. */ {
         iConstForEach(ObjectList, child, children_Widget(d)) {
             const iWidget *item = constAs_Widget(child.object);
             if (flags_Widget(item) & selected_WidgetFlag) {
                 windowCoord.y -= item->rect.pos.y;
+                allowOverflow = iTrue;
             }
         }
     }
@@ -1129,11 +1131,13 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, int menuOpenFlags) {
         rightExcess  += r;
     }
 #endif
-    if (bottomExcess > 0 && (!isPortraitPhone || !isSlidePanel)) {
-        d->rect.pos.y -= bottomExcess;
-    }
-    if (topExcess > 0) {
-        d->rect.pos.y += topExcess;
+    if (!allowOverflow) {
+        if (bottomExcess > 0 && (!isPortraitPhone || !isSlidePanel)) {
+            d->rect.pos.y -= bottomExcess;
+        }
+        if (topExcess > 0) {
+            d->rect.pos.y += topExcess;
+        }
     }
     if (rightExcess > 0) {
         d->rect.pos.x -= rightExcess;
@@ -1455,12 +1459,17 @@ void addTabCloseButton_Widget(iWidget *tabs, const iWidget *page, const char *co
     iLabelWidget *tabButton = tabButtonForPage_Widget_(tabs, page);
     setPadding_Widget(as_Widget(tabButton), 0, 0, 0, gap_UI / 4);
     setFlags_Widget(as_Widget(tabButton), arrangeVertical_WidgetFlag | resizeHeightOfChildren_WidgetFlag, iTrue);
+#if defined (iPlatformApple)
+    const int64_t edge = moveToParentLeftEdge_WidgetFlag;
+#else
+    const int64_t edge = moveToParentRightEdge_WidgetFlag;
+#endif
     iLabelWidget *close = addChildFlags_Widget(
         as_Widget(tabButton),
         iClob(new_LabelWidget(close_Icon,
                               format_CStr("%s id:%s", command, cstr_String(id_Widget(page))))),
-        moveToParentRightEdge_WidgetFlag | tight_WidgetFlag | frameless_WidgetFlag |
-            noBackground_WidgetFlag | hidden_WidgetFlag | visibleOnParentHover_WidgetFlag);
+        edge | tight_WidgetFlag | frameless_WidgetFlag | noBackground_WidgetFlag |
+            hidden_WidgetFlag | visibleOnParentHover_WidgetFlag);
     if (deviceType_App() != desktop_AppDeviceType) {
         setFlags_Widget(as_Widget(close),
                         hidden_WidgetFlag | visibleOnParentHover_WidgetFlag, iFalse);