4 files changed, 42 insertions, 6 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 2cce9b24..6ea9348e 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -168,7 +168,7 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
     /* Returns the human-readable label of the link. */
     static iRegExp *pattern_;
     if (!pattern_) {
-        pattern_ = new_RegExp("=>\\s*([^\\s]+)(\\s.*)?", caseInsensitive_RegExpOption);
+        pattern_ = newGemtextLink_RegExp();
     }
     iRegExpMatch m;
     init_RegExpMatch(&m);
diff --git a/src/gmutil.c b/src/gmutil.c
index a9d70fbb..57d7e350 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -25,6 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/regexp.h>
 #include <the_Foundation/object.h>
 #include <the_Foundation/path.h>
+#include <the_Foundation/regexp.h>
+
+iRegExp *newGemtextLink_RegExp(void) {
+    return new_RegExp("=>\\s*([^\\s]+)(\\s.*)?", 0);
+}
 
 void init_Url(iUrl *d, const iString *text) {
     /* Handle "file:" as a special case since it only has the path part. */
diff --git a/src/gmutil.h b/src/gmutil.h
index 84f31e2e..09d333e7 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -26,6 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/string.h>
 
 iDeclareType(GmError)
+iDeclareType(RegExp)
 iDeclareType(Url)
 
 /* Response status codes. */
@@ -90,6 +91,8 @@ struct Impl_GmError {
 iBool               isDefined_GmError   (enum iGmStatusCode code);
 const iGmError *    get_GmError         (enum iGmStatusCode code);
 
+iRegExp *       newGemtextLink_RegExp   (void);
+
 struct Impl_Url {
     iRangecc scheme;
     iRangecc host;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index ed38ad0b..3175f274 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1094,6 +1094,7 @@ static const char *zipPageHeading_(const iRangecc mime) {
 }
 
 static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d) {
+    iWidget *w = as_Widget(d);
     delete_Gempub(d->sourceGempub);
     d->sourceGempub = NULL;
     if (!cmpCase_String(&d->sourceMime, "application/octet-stream") ||
@@ -1111,20 +1112,27 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d) {
         }
     }
     if (!d->sourceGempub) {
-        iString *localPath = localFilePathFromUrl_String(d->mod.url);
+        const iString *localPath = collect_String(localFilePathFromUrl_String(d->mod.url));
+        iBool isInside = iFalse;
+        if (localPath && !fileExists_FileInfo(localPath)) {
+            /* This URL may refer to a file inside the archive. */
+            localPath = findContainerArchive_Path(localPath);
+            isInside = iTrue;
+        }
         if (localPath && equal_CStr(mediaType_Path(localPath), "application/gpub+zip")) {
             iGempub *gempub = new_Gempub();
             if (openFile_Gempub(gempub, localPath)) {
-                setBaseUrl_Gempub(gempub, d->mod.url);
-                setSource_DocumentWidget(d, collect_String(coverPageSource_Gempub(gempub)));
-                setCStr_String(&d->sourceMime, mimeType_Gempub);
+                setBaseUrl_Gempub(gempub, collect_String(makeFileUrl_String(localPath)));
+                if (!isInside) {
+                    setSource_DocumentWidget(d, collect_String(coverPageSource_Gempub(gempub)));
+                    setCStr_String(&d->sourceMime, mimeType_Gempub);
+                }
                 d->sourceGempub = gempub;
             }
             else {
                 delete_Gempub(gempub);
             }
         }
-        delete_String(localPath);
     }
     if (d->sourceGempub) {
         if (preloadCoverImage_Gempub(d->sourceGempub, d->doc)) {
@@ -1132,6 +1140,26 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d) {
             updateVisible_DocumentWidget_(d);
             invalidate_DocumentWidget_(d);
         }
+        if (prefs_App()->pinSplit && equal_String(d->mod.url, indexPageUrl_Gempub(d->sourceGempub))) {
+            const iString *navStart = navStartLinkUrl_Gempub(d->sourceGempub);
+            if (navStart) {
+                iWindow *win = get_Window();
+                /* Auto-split to show index and the first navigation link. */
+                if (numRoots_Window(win) == 2) {
+                    /* This document is showing the index page. */
+                    iRoot *other = otherRoot_Window(win, w->root);
+                    postCommandf_Root(other, "open url:%s", cstr_String(navStart));
+                    if (prefs_App()->pinSplit == 1 && w->root == win->roots[1]) {
+                        /* On the wrong side. */
+                        postCommand_App("ui.split swap:1");
+                    }
+                }
+                else {
+                    postCommandf_App(
+                        "open newtab:%d url:%s", otherRoot_OpenTabFlag, cstr_String(navStart));
+                }
+            }
+        }
     }
 }