6 files changed, 31 insertions, 14 deletions

diff --git a/src/app.c b/src/app.c
index 2de4c370..1f7abbc4 100644
--- a/src/app.c
+++ b/src/app.c
@@ -215,6 +215,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "memorysize.set arg:%d\n", d->prefs.maxMemorySize);
     appendFormat_String(str, "decodeurls arg:%d\n", d->prefs.decodeUserVisibleURLs);
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
+    appendFormat_String(str, "linespacing.set arg:%f\n", d->prefs.lineSpacing);
     /* 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.mono.gemini.changed arg:%d\n", d->prefs.monospaceGemini);
@@ -1707,6 +1708,12 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
         updateFontButton_(findChild_Widget(d, "prefs.headingfont"), arg_Command(cmd));
         return iFalse;
     }
+    else if (startsWith_CStr(cmd, "input.ended id:prefs.linespacing")) {    
+        /* Apply line spacing changes immediately. */
+        const iInputWidget *lineSpacing = findWidget_App("prefs.linespacing");
+        postCommandf_App("linespacing.set arg:%f", toFloat_String(text_InputWidget(lineSpacing)));
+        return iTrue;
+    }
     else if (equal_Command(cmd, "prefs.ostheme.changed")) {
         postCommandf_App("ostheme arg:%d", arg_Command(cmd));
     }
@@ -2118,6 +2125,11 @@ iBool handleCommand_App(const char *cmd) {
         postCommand_App("document.layout.changed");
         return iTrue;
     }
+    else if (equal_Command(cmd, "linespacing.set")) {
+        d->prefs.lineSpacing = iMax(0.5f, argf_Command(cmd));
+        postCommand_App("document.layout.changed redo:1");
+        return iTrue;
+    }
     else if (equal_Command(cmd, "quoteicon.set")) {
         d->prefs.quoteIcon = arg_Command(cmd) != 0;
         postCommand_App("document.layout.changed");
@@ -2516,6 +2528,8 @@ iBool handleCommand_App(const char *cmd) {
             findChild_Widget(dlg, format_CStr("prefs.linewidth.%d", d->prefs.lineWidth)),
             selected_WidgetFlag,
             iTrue);
+        setText_InputWidget(findChild_Widget(dlg, "prefs.linespacing"),
+                            collectNewFormat_String("%.2f", d->prefs.lineSpacing));
         setFlags_Widget(
             findChild_Widget(dlg, format_CStr("prefs.quoteicon.%d", d->prefs.quoteIcon)),
             selected_WidgetFlag,
diff --git a/src/gmdocument.c b/src/gmdocument.c
index a46e71cf..3d91fb34 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -147,7 +147,7 @@ static int lastVisibleRunBottom_GmDocument_(const iGmDocument *d) {
         if (isEmpty_Range(&run->text)) {
             continue;
         }
-        return bottom_Rect(run->bounds);
+        return top_Rect(run->bounds) + height_Rect(run->bounds) * prefs_App()->lineSpacing;
     }
     return 0;
 }
@@ -546,7 +546,8 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                 banner.text      = bannerText;
                 banner.color     = tmBannerTitle_ColorId;
                 pushBack_Array(&d->layout, &banner);
-                pos.y += height_Rect(banner.visBounds) + lineHeight_Text(paragraph_FontId);
+                pos.y += height_Rect(banner.visBounds) +
+                         lineHeight_Text(paragraph_FontId) * prefs->lineSpacing;
             }
         }
         /* Empty lines don't produce text runs. */
@@ -560,7 +561,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                 run.text           = iNullRange;
                 pushBack_Array(&d->layout, &run);
             }
-            pos.y += lineHeight_Text(run.font);
+            pos.y += lineHeight_Text(run.font) * prefs->lineSpacing;
             prevType = type;
             if (type != quote_GmLineType) {
                 addQuoteIcon = prefs->quoteIcon;
@@ -586,11 +587,6 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             if (type == link_GmLineType && prevNonBlankType == link_GmLineType && followsBlank) {
                 required = 1.25f * lineHeight_Text(paragraph_FontId);
             }
-            else if (type == link_GmLineType && prevType == link_GmLineType) {
-                /* Balance space between the link icons and the labels, both vertically
-                   between icons and between the icon and the label. */
-                //required *= 0.75f;
-            }
             if (type == quote_GmLineType && prevType == quote_GmLineType) {
                 /* No margin between consecutive quote lines. */
                 required = 0;
@@ -598,9 +594,10 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             if (isEmpty_Array(&d->layout)) {
                 required = 0; /* top of document */
             }
+            required *= prefs->lineSpacing;
             int delta = pos.y - lastVisibleRunBottom_GmDocument_(d);
             if (delta < required) {
-                pos.y += required - delta;
+                pos.y += (required - delta);
             }
         }
         /* Folded blocks are represented by a single run with the alt text. */
@@ -778,7 +775,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             run.flags &= ~startOfLine_GmRunFlag;
             runLine.start = contPos;
             trimStart_Rangecc(&runLine);
-            pos.y += lineHeight_Text(run.font);
+            pos.y += lineHeight_Text(run.font) * prefs->lineSpacing;
             if (--bigCount == 0) {
                 run.font = fonts[text_GmLineType];
                 run.color = colors[text_GmLineType];
diff --git a/src/prefs.c b/src/prefs.c
index f1842e9a..557c6887 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -54,6 +54,7 @@ void init_Prefs(iPrefs *d) {
     d->boldLinkDark      = iTrue;
     d->boldLinkLight     = iTrue;
     d->lineWidth         = 38;
+    d->lineSpacing       = 1.0f;
     d->bigFirstParagraph = iTrue;
     d->quoteIcon         = iTrue;
     d->centerShortDocs   = iTrue;
diff --git a/src/prefs.h b/src/prefs.h
index 655ec949..c1519459 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -79,6 +79,7 @@ struct Impl_Prefs {
     iBool            boldLinkDark;
     iBool            boldLinkLight;
     int              lineWidth;
+    float            lineSpacing;
     iBool            bigFirstParagraph;
     iBool            quoteIcon;
     iBool            centerShortDocs;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 5bded6c6..38f34c77 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1298,9 +1298,9 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d, iBool
                     2);
             }
             if (preloadCoverImage_Gempub(d->sourceGempub, d->doc)) {
-            redoLayout_GmDocument(d->doc);
-            updateVisible_DocumentWidget_(d);
-            invalidate_DocumentWidget_(d);
+                redoLayout_GmDocument(d->doc);
+                updateVisible_DocumentWidget_(d);
+                invalidate_DocumentWidget_(d);
             }
         }
         else if (equal_String(d->mod.url, indexPageUrl_Gempub(d->sourceGempub))) {
@@ -2461,7 +2461,10 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         invalidate_DocumentWidget_(d);
         refresh_Widget(w);
     }
-    else if (equal_Command(cmd, "document.layout.changed") && document_App() == d) {
+    else if (equal_Command(cmd, "document.layout.changed") && document_Root(get_Root()) == d) {
+        if (argLabel_Command(cmd, "redo")) {
+            redoLayout_GmDocument(d->doc);
+        }
         updateSize_DocumentWidget(d);
     }
     else if (equal_Command(cmd, "pinsplit.set")) {
diff --git a/src/ui/util.c b/src/ui/util.c
index 5aea4f11..d68274ad 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1809,6 +1809,7 @@ iWidget *makePreferences_Widget(void) {
             addRadioButton_(widths, "prefs.linewidth.1000", "${prefs.linewidth.fill}", "linewidth.set arg:1000");
         }
         addChildFlags_Widget(values, iClob(widths), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+        addPrefsInputWithHeading_(headings, values, "prefs.linespacing", iClob(new_InputWidget(5)));
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.quoteicon}")));
         iWidget *quote = new_Widget(); {
             addRadioButton_(quote, "prefs.quoteicon.1", "${prefs.quoteicon.icon}", "quoteicon.set arg:1");