25 files changed, 78 insertions, 35 deletions

diff --git a/po/en.po b/po/en.po
index f0a5b1c7..526a723d 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1485,6 +1485,9 @@ msgstr "Gopher"
 msgid "prefs.boldlink"
 msgstr "Bold links:"
 
+msgid "prefs.boldlink.visited"
+msgstr "Visited"
+
 # Interpretation: (Bold links) on dark (background).
 msgid "prefs.boldlink.dark"
 msgstr "On Dark"
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 17f3a3d6..17a2d191 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 42d62334..51b9a10d 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index 5d865707..7b83b77f 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index 5f620910..91121500 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/es_MX.bin b/res/lang/es_MX.bin
index de5e253f..df129a8a 100644
--- a/res/lang/es_MX.bin
+++ b/res/lang/es_MX.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index 5ca852cf..fad0413b 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index b6a577b3..20fd19ef 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/gl.bin b/res/lang/gl.bin
index 55ea5675..1cac09b9 100644
--- a/res/lang/gl.bin
+++ b/res/lang/gl.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index 63a9cb33..64ebfe03 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 19b631aa..87064cef 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index 2af131f1..726441ce 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index 93e070de..a857c547 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 2ec7eaaf..c1884651 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index 06cf8cf8..981ab7e1 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 41f7fb4b..384665cc 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index c68303d1..51080283 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 0b243530..0cf56935 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index d5c13885..28e7cedf 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/app.c b/src/app.c
index 8442a2c8..6282ade2 100644
--- a/src/app.c
+++ b/src/app.c
@@ -231,22 +231,46 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
     appendFormat_String(str, "linespacing.set arg:%f\n", d->prefs.lineSpacing);
     appendFormat_String(str, "returnkey.set arg:%d\n", d->prefs.returnKey);
-    /* TODO: Set up an array of booleans in Prefs and do these in a loop. */
-    appendFormat_String(str, "prefs.animate.changed arg:%d\n", d->prefs.uiAnimations);
-    appendFormat_String(str, "prefs.font.smooth.changed arg:%d\n", d->prefs.fontSmoothing);
-    appendFormat_String(str, "prefs.gemtext.ansi.changed arg:%d\n", d->prefs.gemtextAnsiEscapes);
-    appendFormat_String(str, "prefs.mono.gemini.changed arg:%d\n", d->prefs.monospaceGemini);
-    appendFormat_String(str, "prefs.mono.gopher.changed arg:%d\n", d->prefs.monospaceGopher);
-    appendFormat_String(str, "prefs.boldlink.dark.changed arg:%d\n", d->prefs.boldLinkDark);
-    appendFormat_String(str, "prefs.boldlink.light.changed arg:%d\n", d->prefs.boldLinkLight);
-    appendFormat_String(str, "prefs.biglede.changed arg:%d\n", d->prefs.bigFirstParagraph);
-    appendFormat_String(str, "prefs.plaintext.wrap.changed arg:%d\n", d->prefs.plainTextWrap);
-    appendFormat_String(str, "prefs.sideicon.changed arg:%d\n", d->prefs.sideIcon);
-    appendFormat_String(str, "prefs.centershort.changed arg:%d\n", d->prefs.centerShortDocs);
-    appendFormat_String(str, "prefs.collapsepreonload.changed arg:%d\n", d->prefs.collapsePreOnLoad);
-    appendFormat_String(str, "prefs.hoverlink.changed arg:%d\n", d->prefs.hoverLink);
-    appendFormat_String(str, "prefs.bookmarks.addbottom arg:%d\n", d->prefs.addBookmarksToBottom);
-    appendFormat_String(str, "prefs.archive.openindex.changed arg:%d\n", d->prefs.openArchiveIndexPages);
+    /* TODO: This array belongs in Prefs. It can then be used for command handling as well. */
+    const struct {
+        const char * id;
+        const iBool *value;
+    } boolPrefs[] = {
+        { "prefs.animate", &d->prefs.uiAnimations },
+        { "prefs.font.smooth", &d->prefs.fontSmoothing },
+        { "prefs.gemtext.ansi", &d->prefs.gemtextAnsiEscapes },
+        { "prefs.mono.gemini", &d->prefs.monospaceGemini },
+        { "prefs.mono.gopher", &d->prefs.monospaceGopher },
+        { "prefs.boldlink.visited", &d->prefs.boldLinkVisited },
+        { "prefs.boldlink.dark", &d->prefs.boldLinkDark },
+        { "prefs.boldlink.light", &d->prefs.boldLinkLight },
+        { "prefs.biglede", &d->prefs.bigFirstParagraph },
+        { "prefs.plaintext.wrap", &d->prefs.plainTextWrap },
+        { "prefs.sideicon", &d->prefs.sideIcon },
+        { "prefs.centershort", &d->prefs.centerShortDocs },
+        { "prefs.collapsepreonload", &d->prefs.collapsePreOnLoad },
+        { "prefs.hoverlink", &d->prefs.hoverLink },
+        { "prefs.bookmarks.addbottom", &d->prefs.addBookmarksToBottom },
+        { "prefs.archive.openindex", &d->prefs.openArchiveIndexPages },
+    };
+    iForIndices(i, boolPrefs) {
+        appendFormat_String(str, "%s.changed arg:%d\n", boolPrefs[i].id, *boolPrefs[i].value);
+    }
+//    appendFormat_String(str, "prefs.animate.changed arg:%d\n", d->prefs.uiAnimations);
+//    appendFormat_String(str, "prefs.font.smooth.changed arg:%d\n", d->prefs.fontSmoothing);
+//    appendFormat_String(str, "prefs.gemtext.ansi.changed arg:%d\n", d->prefs.gemtextAnsiEscapes);
+//    appendFormat_String(str, "prefs.mono.gemini.changed arg:%d\n", d->prefs.monospaceGemini);
+//    appendFormat_String(str, "prefs.mono.gopher.changed arg:%d\n", d->prefs.monospaceGopher);
+//    appendFormat_String(str, "prefs.boldlink.dark.changed arg:%d\n", d->prefs.boldLinkDark);
+//    appendFormat_String(str, "prefs.boldlink.light.changed arg:%d\n", d->prefs.boldLinkLight);
+//    appendFormat_String(str, "prefs.biglede.changed arg:%d\n", d->prefs.bigFirstParagraph);
+//    appendFormat_String(str, "prefs.plaintext.wrap.changed arg:%d\n", d->prefs.plainTextWrap);
+//    appendFormat_String(str, "prefs.sideicon.changed arg:%d\n", d->prefs.sideIcon);
+//    appendFormat_String(str, "prefs.centershort.changed arg:%d\n", d->prefs.centerShortDocs);
+//    appendFormat_String(str, "prefs.collapsepreonload.changed arg:%d\n", d->prefs.collapsePreOnLoad);
+//    appendFormat_String(str, "prefs.hoverlink.changed arg:%d\n", d->prefs.hoverLink);
+//    appendFormat_String(str, "prefs.bookmarks.addbottom arg:%d\n", d->prefs.addBookmarksToBottom);
+//    appendFormat_String(str, "prefs.archive.openindex.changed arg:%d\n", d->prefs.openArchiveIndexPages);
     appendFormat_String(str, "quoteicon.set arg:%d\n", d->prefs.quoteIcon ? 1 : 0);
     appendFormat_String(str, "theme.set arg:%d auto:1\n", d->prefs.theme);
     appendFormat_String(str, "accent.set arg:%d\n", d->prefs.accent);
@@ -2376,9 +2400,13 @@ iBool handleCommand_App(const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "prefs.boldlink.dark.changed") ||
-             equal_Command(cmd, "prefs.boldlink.light.changed")) {
+             equal_Command(cmd, "prefs.boldlink.light.changed") ||
+             equal_Command(cmd, "prefs.boldlink.visited.changed")) {
         const iBool isSet = (arg_Command(cmd) != 0);
-        if (startsWith_CStr(cmd, "prefs.boldlink.dark")) {
+        if (startsWith_CStr(cmd, "prefs.boldlink.visited")) {
+            d->prefs.boldLinkVisited = isSet;
+        }
+        else if (startsWith_CStr(cmd, "prefs.boldlink.dark")) {
             d->prefs.boldLinkDark = isSet;
         }
         else {
@@ -2763,6 +2791,9 @@ iBool handleCommand_App(const char *cmd) {
         setFlags_Widget(findChild_Widget(dlg, "prefs.mono.gopher"),
                         selected_WidgetFlag,
                         d->prefs.monospaceGopher);
+        setFlags_Widget(findChild_Widget(dlg, "prefs.boldlink.visited"),
+                        selected_WidgetFlag,
+                        d->prefs.boldLinkVisited);
         setFlags_Widget(findChild_Widget(dlg, "prefs.boldlink.dark"),
                         selected_WidgetFlag,
                         d->prefs.boldLinkDark);
diff --git a/src/gmdocument.c b/src/gmdocument.c
index f43d2758..e37d585e 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -890,7 +890,8 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                     rts.lineHeightReduction = 0.06f;
                 }
                 /* Visited links are never bold. */
-                if (run.linkId && linkFlags_GmDocument(d, run.linkId) & visited_GmLinkFlag) {
+                if (run.linkId && !prefs->boldLinkVisited &&
+                    linkFlags_GmDocument(d, run.linkId) & visited_GmLinkFlag) {
                     rts.run.font = paragraph_FontId;
                 }
             }
diff --git a/src/prefs.c b/src/prefs.c
index ea0717e5..673470d6 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -64,6 +64,7 @@ void init_Prefs(iPrefs *d) {
     d->gemtextAnsiEscapes = iFalse;
     d->monospaceGemini   = iFalse;
     d->monospaceGopher   = iFalse;
+    d->boldLinkVisited   = iTrue;
     d->boldLinkDark      = iTrue;
     d->boldLinkLight     = iTrue;
     d->lineWidth         = 38;
diff --git a/src/prefs.h b/src/prefs.h
index a44e98b7..70846be4 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -91,6 +91,7 @@ struct Impl_Prefs {
     iBool            gemtextAnsiEscapes;
     iBool            monospaceGemini;
     iBool            monospaceGopher;
+    iBool            boldLinkVisited;
     iBool            boldLinkDark;
     iBool            boldLinkLight;
     int              lineWidth;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index b2594997..8fefb95c 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2173,6 +2173,7 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
                               body_GmRequest(req->req),
                               allowHide_MediaFlag);
                 redoLayout_GmDocument(d->doc);
+                iZap(d->visibleRuns); /* pointers invalidated */
                 updateVisible_DocumentWidget_(d);
                 invalidate_DocumentWidget_(d);
                 refresh_Widget(as_Widget(d));
diff --git a/src/ui/util.c b/src/ui/util.c
index 1ebdd3b3..3b146155 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2549,22 +2549,6 @@ iWidget *makePreferences_Widget(void) {
             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) */
-                iWidget *tog;
-                setTextCStr_LabelWidget(
-                    addChild_Widget(boldLink, tog = iClob(makeToggle_Widget("prefs.boldlink.dark"))),
-                    "${prefs.boldlink.dark}");
-                setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
-                updateSize_LabelWidget((iLabelWidget *) tog);
-                setTextCStr_LabelWidget(
-                    addChild_Widget(boldLink, tog = iClob(makeToggle_Widget("prefs.boldlink.light"))),
-                    "${prefs.boldlink.light}");
-                setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
-                updateSize_LabelWidget((iLabelWidget *) tog);
-            }
-            addChildFlags_Widget(values, iClob(boldLink), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
             addDialogToggle_(headings, values, "${prefs.gemtext.ansi}", "prefs.gemtext.ansi");
             addDialogToggle_(headings, values, "${prefs.font.smooth}", "prefs.font.smooth");
             addDialogPadding_(headings, values);
@@ -2604,6 +2588,27 @@ iWidget *makePreferences_Widget(void) {
         }
         addChildFlags_Widget(values, iClob(quote), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
         addDialogToggle_(headings, values, "${prefs.biglede}", "prefs.biglede");
+        addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.boldlink}")));
+        iWidget *boldLink = new_Widget(); {
+            /* TODO: Add a utility function for this type of toggles? (also for above) */
+            iWidget *tog;
+            setTextCStr_LabelWidget(
+                addChild_Widget(boldLink, tog = iClob(makeToggle_Widget("prefs.boldlink.visited"))),
+                "${prefs.boldlink.visited}");
+            setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
+            updateSize_LabelWidget((iLabelWidget *) tog);
+            setTextCStr_LabelWidget(
+                addChild_Widget(boldLink, tog = iClob(makeToggle_Widget("prefs.boldlink.dark"))),
+                "${prefs.boldlink.dark}");
+            setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
+            updateSize_LabelWidget((iLabelWidget *) tog);
+            setTextCStr_LabelWidget(
+                addChild_Widget(boldLink, tog = iClob(makeToggle_Widget("prefs.boldlink.light"))),
+                "${prefs.boldlink.light}");
+            setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
+            updateSize_LabelWidget((iLabelWidget *) tog);
+        }
+        addChildFlags_Widget(values, iClob(boldLink), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
         addDialogToggle_(headings, values, "${prefs.plaintext.wrap}", "prefs.plaintext.wrap");
         addDialogToggle_(headings, values, "${prefs.collapsepreonload}", "prefs.collapsepreonload");
         addDialogPadding_(headings, values);