4 files changed, 63 insertions, 34 deletions

diff --git a/src/app.c b/src/app.c
index ee30d644..5543db11 100644
--- a/src/app.c
+++ b/src/app.c
@@ -587,7 +587,8 @@ iBool handleCommand_App(const char *cmd) {
         setCommandHandler_Widget(dlg, handlePrefsCommands_);
     }
     else if (equal_Command(cmd, "navigate.home")) {
-        postCommand_App("open url:about:home");
+        /* TODO: Look for bookmarks tagged homepage, or use the URL set in Preferences. */
+        postCommand_App("open url:about:lagrange");
         return iTrue;
     }
     else if (equal_Command(cmd, "zoom.set")) {
diff --git a/src/gmdocument.c b/src/gmdocument.c
index d140b065..52ff1654 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -289,7 +289,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     static const char *bullet = "\u2022";
     static const char *folder = "\U0001f4c1";
     static const char *globe  = "\U0001f310";
-    const float midRunSkip = 0.1f; /* extra space between wrapped text/quote lines */
+    const float midRunSkip = 0.120f; /* extra space between wrapped text/quote lines */
     clear_Array(&d->layout);
     clearLinks_GmDocument_(d);
     clear_Array(&d->headings);
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 996c77ea..2b6ee9f9 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -2,11 +2,13 @@
 #include "gmutil.h"
 #include "gmcerts.h"
 #include "app.h" /* dataDir_App() */
+#include "embedded.h"
 
 #include <the_Foundation/file.h>
-#include <the_Foundation/tlsrequest.h>
 #include <the_Foundation/mutex.h>
 #include <the_Foundation/path.h>
+#include <the_Foundation/regexp.h>
+#include <the_Foundation/tlsrequest.h>
 
 #include <SDL_timer.h>
 
@@ -81,17 +83,17 @@ enum iGmRequestState {
 };
 
 struct Impl_GmRequest {
-    iObject               object;
-    iMutex                mutex;
-    iGmCerts *            certs; /* not owned */
-    enum iGmRequestState  state;
-    iString               url;
-    iTlsRequest *         req;
-    iGmResponse           resp;
-    uint32_t              timeoutId; /* in case server doesn't close the connection */
-    iAudience *           updated;
-    iAudience *           timeout;
-    iAudience *           finished;
+    iObject              object;
+    iMutex               mutex;
+    iGmCerts *           certs; /* not owned */
+    enum iGmRequestState state;
+    iString              url;
+    iTlsRequest *        req;
+    iGmResponse          resp;
+    uint32_t             timeoutId; /* in case server doesn't close the connection */
+    iAudience *          updated;
+    iAudience *          timeout;
+    iAudience *          finished;
 };
 
 iDefineObjectConstructionArgs(GmRequest, (iGmCerts *certs), certs)
@@ -261,6 +263,40 @@ static void requestFinished_GmRequest_(iAnyObject *obj) {
     iNotifyAudience(d, finished, GmRequestFinished);
 }
 
+static const iBlock *aboutPageSource_(iRangecc path) {
+    const iBlock *src = NULL;
+    if (equalCase_Rangecc(&path, "lagrange")) {
+        return &blobAbout_Embedded;
+    }
+    if (equalCase_Rangecc(&path, "help")) {
+        return &blobHelp_Embedded;
+    }
+    if (equalCase_Rangecc(&path, "version")) {
+        return &blobVersion_Embedded;
+    }
+    return src;
+}
+
+static const iBlock *replaceVariables_(const iBlock *block) {
+    iRegExp *var = new_RegExp("\\$\\{([A-Z_]+)\\}", 0);
+    iRegExpMatch m;
+    if (matchRange_RegExp(var, range_Block(block), &m)) {
+        iBlock *replaced = collect_Block(copy_Block(block));
+        do {
+            const iRangei span = m.range;
+            remove_Block(replaced, span.start, size_Range(&span));
+            const iRangecc name = capturedRange_RegExpMatch(&m, 1);
+            if (equal_Rangecc(&name, "APP_VERSION")) {
+                insertData_Block(replaced, span.start,
+                                 LAGRANGE_APP_VERSION, strlen(LAGRANGE_APP_VERSION));
+            }
+        } while (matchRange_RegExp(var, range_Block(replaced), &m));
+        block = replaced;
+    }
+    iRelease(var);
+    return block;
+}
+
 void submit_GmRequest(iGmRequest *d) {
     iAssert(d->state == initialized_GmRequestState);
     if (d->state != initialized_GmRequestState) {
@@ -272,25 +308,11 @@ void submit_GmRequest(iGmRequest *d) {
     /* Check for special protocols. */
     /* TODO: If this were a library, these could be handled via callbacks. */
     if (equalCase_Rangecc(&url.protocol, "about")) {
-        if (equalCase_Rangecc(&url.path, "home")) {
+        const iBlock *src = aboutPageSource_(url.path);
+        if (src) {
             d->resp.statusCode = success_GmStatusCode;
             setCStr_String(&d->resp.meta, "text/gemini; charset=utf-8");
-            setCStr_Block(&d->resp.body,
-"```\n"
-"ooooo\n"
-"`888'\n"
-" 888          .oooo.    .oooooooo oooo d8b  .oooo.   ooo. .oo.    .oooooooo  .ooooo. \n"
-" 888         `P  )88b  888' `88b  `888\"\"8P `P  )88b  `888P\"Y88b  888' `88b  d88' `88b \n"
-" 888          .oP\"888  888   888   888      .oP\"888   888   888  888   888  888ooo888 \n"
-" 888       o d8(  888  `88bod8P'   888     d8(  888   888   888  `88bod8P'  888    .o \n"
-"o888ooooood8 `Y888\"\"8o `8oooooo.  d888b    `Y888\"\"8o o888o o888o `8oooooo.  `Y8bod8P' \n"
-"                       d\"     YD                                 d\"     YD\n"
-"                       \"Y88888P'                                 \"Y88888P'\n"
-"```\n"
-"# A Beautiful Gemini Client\n"
-"## Version " LAGRANGE_APP_VERSION "\n\n"
-"=> https://skyjake.fi/@jk by Jaakko Keränen <code@iki.fi>\n"
-"Crafted with \u2615 in Finland\n");
+            set_Block(&d->resp.body, replaceVariables_(src));
             d->state = receivingBody_GmRequestState;
             iNotifyAudience(d, updated, GmRequestUpdated);
         }
diff --git a/src/ui/window.c b/src/ui/window.c
index 2f5c428d..5e1ad9c6 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -113,6 +113,11 @@ static const iMenuItem viewMenuItems[] = {
     { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
     { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
 };
+
+static const iMenuItem helpMenuItems[] = {
+    { "Help", 0, 0, "open url:about:help" },
+    { "Release Notes", 0, 0, "open url:about:version" },
+};
 #endif
 
 static const char *reloadCStr_ = "\U0001f503";
@@ -288,9 +293,10 @@ static void setupUserInterface_Window(iWindow *d) {
         setAlignVisually_LabelWidget(navMenu, iTrue);
         addChild_Widget(navBar, iClob(navMenu));
 #else
-        insertMenuItems_MacOS("File", fileMenuItems, iElemCount(fileMenuItems));
-        insertMenuItems_MacOS("Edit", editMenuItems, iElemCount(editMenuItems));
-        insertMenuItems_MacOS("View", viewMenuItems, iElemCount(viewMenuItems));
+        insertMenuItems_MacOS("File", 1, fileMenuItems, iElemCount(fileMenuItems));
+        insertMenuItems_MacOS("Edit", 2, editMenuItems, iElemCount(editMenuItems));
+        insertMenuItems_MacOS("View", 3, viewMenuItems, iElemCount(viewMenuItems));
+        insertMenuItems_MacOS("Help", 5, helpMenuItems, iElemCount(helpMenuItems));
 #endif
     }
     /* Tab bar. */ {