15 files changed, 328 insertions, 71 deletions

diff --git a/res/about/help.gmi b/res/about/help.gmi
index c710afc9..604f0fed 100644
--- a/res/about/help.gmi
+++ b/res/about/help.gmi
@@ -27,25 +27,29 @@ Like Gemini, Lagrange has been designed with minimalism in mind. It depends on a
 
 * Beautiful typography using Unicode fonts
 * Autogenerated page style and Unicode icon for each Gemini domain
-* Smart suggestions when typing the URL — search bookmarks, history, identities
-* Sidebar for page outline, managing bookmarks and identities, and viewing history
-* Multiple tabs
-* Identity management — create and use TLS client certificates
-* Subscribe to Gemini and Atom feeds
-* Use Gemini pages as a source of bookmarks
 * Light and dark color themes
-* Select and copy text with the mouse
-* Find text on the page
-* Search engine integration
-* Open image links inline on the same page
-* Audio playback: MP3, Ogg Vorbis, WAV
-* Open links via keyboard shortcuts
-* Instant back/forward navigation
 * Smooth scrolling
 * Scaling page content (50%...200%)
 * Scaling factor for the UI (for arbitrary monitor DPI)
+
+* Sidebars for managing bookmarks, identities and subscribed feeds, and viewing browsing history and the page outline
+* Multiple tabs
+* Split view for browsing two pages at once
 * Persistent app state — tabs and history are restored on next run
 * Configurable keybindings
+* Open links via keyboard shortcuts
+* Select and copy text with the mouse
+* Find text on the page
+* Open image and audio links inline on the same page
+
+* Instant back/forward navigation
+* Smart suggestions when typing an URL — search bookmarks, history, identities
+* Search engine integration
+* Identity management — create and use TLS client certificates
+* Subscribe to Gemini and Atom feeds
+* Use Gemini pages as a source of bookmarks
+* Audio playback: MP3, Ogg Vorbis, WAV
+* Read Gempub books and view ZIP archive contents
 * Built-in support for Gopher
 * Use proxy servers for HTTP, Gopher, or Gemini content
 
@@ -65,7 +69,7 @@ Lagrange's user interface is modeled after web browsers:
 
 * There is a navigation bar at the top with Back and Forward buttons.
 * There is a tab bar for switching tabs. The tab bar is hidden if there is only one tab open.
-* There is a sidebar for managing bookmarks and TLS identities, and viewing history and the page outline. Sidebars are hidden by default.
+* There is a sidebar for managing bookmarks, subscribed feeds, and TLS identities, and viewing history and the page outline. Sidebars are hidden by default.
 * There is a search bar that appears at the bottom when searching text on the page.
 
 Tip: Try pressing ${CTRL+}5 now to see the page outline.
@@ -104,6 +108,8 @@ Link colors remain the same regardless of which color theme is being used for pa
 
 When you move the mouse cursor over a link, additional information will appear: the destination domain, with the URL scheme shown for non-Gemini links, and the date of the last visit to the URL.
 
+If a link would normally use the default ➤ icon but there is an Emoji at the beginning of the link label, that Emoji is used as the link icon instead. In these cases, you can always assume that the link is a Gemini link whose destination is the same domain that you're currently on.
+
 ### 1.1.3 Page caching
 
 When navigating to a new page, the old page is cached in memory. If you navigate back, the cached copy of the page is restored. Think of it as rewinding time — you return to a past time as if nothing had happened. The same applies to forward navigation; cached pages are loaded if available. This allows back and forward navigation to happen instantly, without any network requests.
@@ -116,9 +122,15 @@ Maximum size of the cache can be configured on the "Network" tab of Preferences.
 
 Holding down ${CTRL} when left-clicking on a link causes it to open in a new tab. Alternatively, middle-clicking a link has the same effect.
 
+${SHIFT+}${CTRL+}click opens the link in a new background tab.
+
 Right-clicking on a link shows a link-specific context menu. From there, you can also open the link in a new background tab, which will keep the current tab open.
 
-### 1.1.5 Opening links using the keyboard
+### 1.1.5 Opening links to the side
+
+Holding down ${SHIFT} when left-clicking on a link opens it in split view mode on the other side of the split. When in split view mode, your tab pinning preference will determine the tab on which clicked links will open. See section 1.8 for more information about split view modes.
+
+### 1.1.6 Opening links using the keyboard
 
 Lagrange has two modes for navigating links with the keyboard. The first uses a modifier key (${ALT} by default): while the modifier is pressed, alphanumeric shortcuts are shown for each visible link in the window. You can then press the corresponding key, still holding the modifier, to open a link. The second mode is based on letters only and focuses on the page row keys. You press and release the activation key ("F" by default) to show the link shortcut letters. In this mode the shortcuts are not in alphabetic order, but instead roughly sorted based on proximity to the F and J keys. You may find this easier to use since it is a simple sequence of key presses without using modifiers, allowing one to keep fingers on or near the home row.
 
@@ -132,7 +144,11 @@ Press ${CTRL+}T to open a new tab, and ${CTRL+}W to close the current tab. Right
 
 The set of open tabs and their full contents are saved when you quit the application and restored when relaunch it.
 
-### 1.2.1 Auto-reloading
+### 1.2.1 Highlighting of open links
+
+When you open a tab, and the URL of that tab is found in a link on another page, that link will be highlighted. This way you can conveniently see which links are currently open in other tabs. These highlights will assist you in navigating hierarchies and index pages.
+
+### 1.2.2 Auto-reloading
 
 A tab can be set to auto-reload at given intervals. The setting is remembered until the tab is closed. This is helpful if you keep a  periodically updated page open for longer periods of time.
 
@@ -191,6 +207,7 @@ Note that remote bookmarks are read-only: they cannot be edited or tagged. This
 * The "remotesource" tag marks the bookmark as a source of remote bookmarks. All links on the source pages are shown as remote bookmarks in the Bookmarks list.
 * The "remote" tag is used for remote bookmarks. These bookmarks cannot be edited or tagged, but you can make a local duplicate to turn it into a regular bookmark.
 * The "usericon" tag prevents a random icon to be selected for the bookmark. This tag is automatically applied when an icon character is entered in the bookmark editor.
+* The "linksplit" tag causes all links on the bookmarked page to open to the side, automatically enabling split view mode.
 
 ## 1.5 Subscribing to feeds
 
@@ -253,6 +270,54 @@ The 🔃 button on the right side of the URL input field is the Reload/Stop butt
 
 The location where downloaded files are saved can be changed in Preferences. The default location is "Downloads" in your home directory.
 
+## 1.8 Split view mode
+
+By default, only one tab is visible at a time in the application window. However, sometimes it is beneficial to see two pages at once. For example, many capsules have top-level menus or lists of articles, and keeping the menu/index visible on the side makes navigation less cumbersome.
+
+Split view mode divides the UI into two equivalent parts. You can have multiple tabs open in each split. Closing all tabs on one side will remove the split and return back to the normal unsplit mode.
+
+View splitting is primarily controlled using the view split menu. The default keybinding for showing it is ${CTRL+}J. For convenience it is recommended to use the shortcuts listed in the menu to change split modes. For example, the sequence ${CTRL+}J 2 can be used to quickly activate a 50% horizontal split, and ${CTRL+}J 1 will merge all open tabs back into the normal unsplit view.
+
+Another way to activate split view mode is to click on a link while holding ${SHIFT}.
+
+Each split has its own sidebars, which means that in split view mode you can have a total of four sidebars open at the same time.
+
+### 1.8.1 Switching focus
+
+At any given time, one of the splits has keyboard focus. This is indicated by a colored line at the top of the section, and some UI elements will be dimmed out on the unfocused side.
+
+To switch keyboard focus between the sections, you can use the Next/Previous Tab keybindings or Ctrl+Tab. Next/Previous Tab is particularly convenient as it cycles through all open tabs, jumping to the other side of the split when appropriate.
+
+You may also press Tab to cycle input focus between all the URL input fields.
+
+### 1.8.2 Pinning
+
+While it is sometimes useful to simply have two independent browsers open side by side, by default view splitting is meant to assist in navigating hierarchies and lists. In the typical use case, you'll have a menu or an index page on the left, and a content page open on the right. Links clicked on the left will automatically open on the right.
+
+This is called "pinning" and the behavior can be configured in Preferences. The "Split view pinning" setting on the "General" tab of Preferences controls where links get opened in a split view. There are three modes available:
+
+* "None" causes links to open in the tab where the link is clicked. In this mode, both sides of the split can be navigated independently.
+* "Left Tab" causes links clicked on the left tab to open on the right side. The page open in the left tab is therefore "pinned" and does not change unless you enter a new URL or navigate to the parent or root.
+* "Right Tab" is the same but works the other way around. The page open in the right tab is pinned and clicked links open on the left.
+
+The default pinning mode is "Left Tab".
+
+## 1.9 Viewing local files and directories
+
+"file://" URLs can be used for accessing local files and directories. File types known to Lagrange, such as .gmi, .txt., .png, .jpg, and .zip, can be viewed inside the application. In this release, types of local files are detected solely based on the file extension.
+
+When viewing a directory, its contents are shown as a list of links. A similar page is shown when viewing a directory inside a ZIP archive.
+
+Note that ZIP archives are not decompressed while browsing their directory structure. Each request that accesses a compressed file in an archive will cause only that particular file to be decompressed. This may cause slow response times when dealing with large compressed files.
+
+## 1.10 Gempub
+
+Gempub is an e-book/archival format that is essentially a set of Gemtext files stored in a ZIP archive.
+
+=> https://codeberg.org/oppenlab/gempub  Gempub specification
+
+Lagrange can be used as a Gempub reader. When a .gpub file has been saved locally, you can open it in the application to see the book cover page. On the cover page you will find a link that opens the contents of the book. When clicked, split view mode is automatically enabled and both the book index page and the first chapter are shown (unless split view pinning has been disabled).
+
 # 2 Customization
 
 You can find a number of settings in Preferences to customize the user interface and page contents.
@@ -261,6 +326,10 @@ You can find a number of settings in Preferences to customize the user interface
 
 One important characteristic of Gemini is that you remain in control of what gets loaded and when. The browser will not suddenly fetch a ton of images, autoplay videos, or make surreptitious connections to any tracking servers — each network request is purposeful and manually triggered. With this in mind, the "Load image on scroll" option is provided to assist keyboard-only browsing and to facilitate a focused reading experience. When enabled, if there is an image link visible on the page and you press Space or ↓, it will be loaded and shown inline _instead_ of the view scrolling down. This allows you to read and see all the content of the page while only tapping on a single key on the keyboard.
 
+The "Open archive indices" option controls whether index.gmi pages are automatically opened while browsing the contents of a ZIP archive. The purpose is to simulate the behavior of a Gemini server where opening a directory will by default show its index page. Enabling this option makes navigating an archived copy of a capsule a more streamlined experience.
+
+"Split view pinning" controls which tab links will be opened on when browsing in split view mode. The default mode is "Left Tab", which means that the page in the left tab is pinned (remains unchanged) when clicking on a link. For more information, see section 1.8.
+
 ## 2.2 Window and UI options
 
 Lagrange supports configuring dark and light UI modes separately.
@@ -300,9 +369,9 @@ There are six fonts available:
 
 * "Nunito" is a friendly rounded sans-serif font.
 * "Fira Sans" is a bolder, narrower, and more angular sans-serif font.
+* "Source Sans 3" is the Lagrange UI font (sans-serif).
 * "Literata" is a heavy and serious serif font.
 * "Tinos" is a lighter serif font.
-* "Source Sans Pro" is the Lagrange UI font.
 * "Iosevka" is the monospace font.
 
 Other style options:
@@ -357,7 +426,13 @@ Likewise (on macOS), .gmi/.gemini file extensions are registered as file formats
 
 You can drag and drop .gmi files on the Lagrange window to open them in the current tab. Dropping multiple files opens them in separate tabs. This is the recommended way to view local files, because there is no "Open File" menu item. You may also type "file://" URLs in the URL field.
 
-## 3.4 Runtime files
+## 3.4 Controlling a running instance
+
+Only one instance of the application is allowed to run at once. This is because each instance uses the same runtime files (section 3.5) without any synchronization. A second instance of the application would overwrite any changes made by the first one, leading to lost bookmarks and other state.
+
+If there already is a running instance you can still use the command line to interact with it: you can open and close tabs, change the currently open URL, or list all the open URLs. See --help for a list of the available options.
+
+## 3.5 Runtime files
 
 Lagrange stores user-specific persistent files in one of the following locations (depending on the operating system):
 
@@ -449,7 +524,7 @@ The combined navigation history of all tabs. Each line specifies one URL:
 ```
 The Transient flag is used to indicate redirections and for marking feed entries as read without actually visiting the URL. URLs with the Transient flag do not appear in the History sidebar tab.
 
-## 3.5 Environment variables
+## 3.6 Environment variables
 
 ### LAGRANGE_OVERRIDE_DPI
 Override display DPI detection with a user-provided value. The same value is applied to all displays. This is useful if your display's DPI value is not being detected correctly. Example:
diff --git a/res/about/version.gmi b/res/about/version.gmi
index dcc68fa8..440e516d 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -7,23 +7,33 @@
 # Release notes
 
 ## 1.4
-* Split modes: horizontal/vertical, two tabs at once, 1:1/2:1/1:2 weights, merge tabs, swap sides.
-=> https://codeberg.org/oppenlab/gempub Basic Gempub support.
-* View ZIP archive contents.
-* View local file directories.
-* Added "Show Downloads" to File menu.
-* Adde "Open Downloaded File" to the file save dialog.
+
+Browsing:
+* Added split view modes: two tabs at once, horizontal/vertical split, 1:1/2:1/1:2 weights, merge tabs, swap sides. See section 1.8 on the Help page for details.
+* Split view pinning: keep a page pinned on one side while all opened links go to the other side.
+* "file://" URLs can be used for viewing contents of local directories and ZIP archives.
+* Basic Gempub support: generating a cover page, automatic split view for index and contents.
+* Navigation arrow buttons are disabled at end/beginning of history.
+* Bold link styling is used for unvisited links only.
+
+Page rendering and UI:
 * Optimized page rendering. Now each line of text is rendered into the view buffer only once, and whenever the view is stationary, content is prefilled in the available space outside the viewport. Previously, at least one line of text was rendered every frame whenever the viewport was moved, which was mostly redundant.
-* Preferences: Reorganized the fonts dropdown menu.
+* Added UI languages: Interlingua, Toki Pona.
+* Added toggles for special tags in the bookmark creation/editor dialog.
+* Added "Show Downloads" to the File/main menu.
+* Added "Open Downloaded File" to the file save dialog to make it easy to find the local copy of the file.
 * Updated the UI font to Source Sans 3. It now has all the styles and weights needed for page rendering, too.
 * Added a semibold Fira Sans weight (used for links).
-* Added UI language: Interlingua.
-* Navigation arrow buttons are disabled at end/beginning of history.
+* Preferences: Reorganized the fonts dropdown menu.
+* All lists support smooth scrolling.
 * Adjustments to how display DPI affects UI scaling.
-* Don't percent encode equal signs in URL paths.
+
+Bug fixes:
 * Fixed allocation of page rendering buffers. Previously, some buffers may have gone unused or were allocated erroneously to the same position, causing unnecessary work for the page renderer.
 * Fixed a possible crash when closing a tab.
-* Fixed various issues in the UI layout
+* Fixed various issues in the UI layout.
+* Fixed parsing URI scheme (limited set of characters allowed).
+* Don't percent encode equal signs in URL paths.
 
 ## 1.3.2
 * Fixed crash after updating from v1.2 due to undefined CA file/path configuration.
diff --git a/src/app.c b/src/app.c
index 39f0346e..4365f77d 100644
--- a/src/app.c
+++ b/src/app.c
@@ -124,7 +124,6 @@ struct Impl_App {
     int          sleepTimer;
 #endif
     iAtomicInt   pendingRefresh;
-    int          tabEnum; /* IDs for new tabs */
     iBool        isLoadingPrefs;
     iStringList *launchCommands;
     iBool        isFinishedLaunching;
@@ -722,7 +721,6 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->certs     = new_GmCerts(dataDir_App_());
     d->visited   = new_Visited();
     d->bookmarks = new_Bookmarks();
-    d->tabEnum   = 0; /* generates unique IDs for tab pages */
     init_Periodic(&d->periodic);
 #if defined (iPlatformAppleDesktop)
     setupApplication_MacOS();
@@ -1602,7 +1600,6 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNe
     else {
         doc = new_DocumentWidget();
     }
-    setId_Widget(as_Widget(doc), format_CStr("document%03d", ++d->tabEnum));
     appendTabPage_Widget(tabs, as_Widget(doc), "", 0, 0);
     iRelease(doc); /* now owned by the tabs */
     addChild_Widget(findChild_Widget(tabs, "tabs.buttons"), iClob(newTabButton));
@@ -2037,7 +2034,9 @@ iBool handleCommand_App(const char *cmd) {
         const int newTab = argLabel_Command(cmd, "newtab");
         if (newTab & otherRoot_OpenTabFlag && numRoots_Window(get_Window()) == 1) {
             /* Need to split first. */
-            postCommandf_App("ui.split arg:3 newtab:%d url:%s",
+            const iInt2 winSize = get_Window()->size;
+            postCommandf_App("ui.split arg:3 axis:%d newtab:%d url:%s",
+                             (float) winSize.x / (float) winSize.y < 0.7f ? 1 : 0,
                              newTab & ~otherRoot_OpenTabFlag,
                              cstr_String(url));
             return iTrue;
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 635682d1..353b4197 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -52,9 +52,23 @@ struct Impl_Bookmark {
 
 iLocalDef uint32_t  id_Bookmark (const iBookmark *d) { return d->node.key; }
 
-iBool   hasTag_Bookmark     (const iBookmark *d, const char *tag);
-void    addTag_Bookmark     (iBookmark *d, const char *tag);
-void    removeTag_Bookmark  (iBookmark *d, const char *tag);
+iBool   hasTag_Bookmark     (const iBookmark *, const char *tag);
+void    addTag_Bookmark     (iBookmark *, const char *tag);
+void    removeTag_Bookmark  (iBookmark *, const char *tag);
+
+iLocalDef void addTagIfMissing_Bookmark(iBookmark *d, const char *tag) {
+    if (!hasTag_Bookmark(d, tag)) {
+        addTag_Bookmark(d, tag);
+    }
+}
+iLocalDef void addOrRemoveTag_Bookmark(iBookmark *d, const char *tag, iBool add) {
+    if (add) {
+        addTagIfMissing_Bookmark(d, tag);
+    }
+    else {
+        removeTag_Bookmark(d, tag);
+    }
+}
 
 /*----------------------------------------------------------------------------------------------*/
 
diff --git a/src/gempub.c b/src/gempub.c
index c9b1c242..0f0345dc 100644
--- a/src/gempub.c
+++ b/src/gempub.c
@@ -25,31 +25,96 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "lang.h"
 #include "defs.h"
 #include "gmdocument.h"
+#include "gmrequest.h"
 #include "ui/util.h"
+#include "app.h"
 
 #include <the_Foundation/archive.h>
 #include <the_Foundation/file.h>
 #include <the_Foundation/path.h>
+#include <the_Foundation/regexp.h>
 
 const char *mimeType_Gempub = "application/gpub+zip";
 
+/*----------------------------------------------------------------------------------------------*/
+
+iDeclareType(GempubNavLink)
+ 
+struct Impl_GempubNavLink {
+    iString url;
+    iString label;
+};
+    
+static void init_GempubNavLink(iGempubNavLink *d) {
+    init_String(&d->url);
+    init_String(&d->label);
+}
+
+static void deinit_GempubNavLink(iGempubNavLink *d) {
+    deinit_String(&d->url);
+    deinit_String(&d->label);   
+}
+
+iDefineTypeConstruction(GempubNavLink)
+    
+/*----------------------------------------------------------------------------------------------*/
+    
 struct Impl_Gempub {
     iArchive *arch;
     iString baseUrl;
     iString props[max_GempubProperty];
+    iArray *navLinks; /* from index page */
 };
 
 iDefineTypeConstruction(Gempub)
     
+static void parseNavigationLinks_Gempub_(const iGempub *d) {
+    if (!isEmpty_Array(d->navLinks)) {
+        return;
+    }
+    iGmRequest *index = iClob(new_GmRequest(certs_App()));
+    setUrl_GmRequest(index, indexPageUrl_Gempub(d));
+    submit_GmRequest(index); /* this is just a local file read */
+    iAssert(isFinished_GmRequest(index));
+    iRangecc src = iNullRange;
+    iRegExp *linkPattern = iClob(newGemtextLink_RegExp());
+    while (nextSplit_Rangecc(range_Block(body_GmRequest(index)), "\n", &src)) {
+        iRangecc line = src;
+        trim_Rangecc(&line);
+        iRegExpMatch m;
+        init_RegExpMatch(&m);
+        if (matchRange_RegExp(linkPattern, line, &m)) {
+            iBeginCollect();
+            const iRangecc url = capturedRange_RegExpMatch(&m, 1);
+            iUrl parts;
+            init_Url(&parts, collectNewRange_String(url));
+            if (isEmpty_Range(&parts.scheme)) {
+                iGempubNavLink link;
+                init_GempubNavLink(&link);
+                set_String(&link.url, absoluteUrl_String(url_GmRequest(index), collectNewRange_String(url)));
+                setRange_String(&link.label, capturedRange_RegExpMatch(&m, 2));
+                trim_String(&link.label);
+                pushBack_Array(d->navLinks, &link);
+            }
+            iEndCollect();
+        }
+    }
+}
+    
 void init_Gempub(iGempub *d) {
     d->arch = NULL;
     init_String(&d->baseUrl);
     iForIndices(i, d->props) {
         init_String(&d->props[i]);
-    }    
+    }
+    d->navLinks = new_Array(sizeof(iGempubNavLink));
 }
 
 void deinit_Gempub(iGempub *d) {
+    iForEach(Array, n, d->navLinks) {
+        deinit_GempubNavLink(n.value);
+    }
+    delete_Array(d->navLinks);
     iForIndices(i, d->props) {
         deinit_String(&d->props[i]);
     }
@@ -140,12 +205,27 @@ void close_Gempub(iGempub *d) {
     }
 }
 
+void setBaseUrl_Gempub(iGempub *d, const iString *url) {
+    set_String(&d->baseUrl, url);
+}
+
 iBool isOpen_Gempub(const iGempub *d) {
     return d->arch != NULL;
 }
 
-void setBaseUrl_Gempub(iGempub *d, const iString *url) {
-    set_String(&d->baseUrl, url);
+const iString *indexPageUrl_Gempub(const iGempub *d) {
+    iAssert(!isEmpty_String(&d->baseUrl));
+    iString *dir = collect_String(copy_String(&d->baseUrl));
+    appendCStr_String(dir, "/");
+    return absoluteUrl_String(dir, &d->props[index_GempubProperty]);
+}
+
+const iString *navStartLinkUrl_Gempub(const iGempub *d) {
+    parseNavigationLinks_Gempub_(d);
+    if (isEmpty_Array(d->navLinks)) {
+        return NULL; /* has no navigation structure */
+    }
+    return &((const iGempubNavLink *) constFront_Array(d->navLinks))->url;
 }
 
 static iBool hasProperty_Gempub_(const iGempub *d, enum iGempubProperty prop) {
@@ -176,7 +256,7 @@ iString *coverPageSource_Gempub(const iGempub *d) {
     appendProperty_Gempub_(d, "${gempub.meta.author}:", author_GempubProperty, out);
     if (!isRemote_Gempub_(d)) {
         appendFormat_String(out, "\n=> %s " book_Icon " ${gempub.cover.view}\n",
-                            cstrCollect_String(concat_Path(baseUrl, &d->props[index_GempubProperty])));
+                            cstr_String(indexPageUrl_Gempub(d)));
         if (hasProperty_Gempub_(d, cover_GempubProperty)) {
             appendFormat_String(out, "\n=> %s  ${gempub.cover.image}\n",
                                 cstrCollect_String(concat_Path(baseUrl, &d->props[cover_GempubProperty])));
diff --git a/src/gempub.h b/src/gempub.h
index 6c1103de..fb3c510b 100644
--- a/src/gempub.h
+++ b/src/gempub.h
@@ -56,6 +56,8 @@ iBool       isOpen_Gempub           (const iGempub *);
 iString *   coverPageSource_Gempub  (const iGempub *);
 iBool       preloadCoverImage_Gempub(const iGempub *, iGmDocument *doc);
 
-const iString *property_Gempub      (const iGempub *, enum iGempubProperty);
+const iString * property_Gempub         (const iGempub *, enum iGempubProperty);
+const iString * indexPageUrl_Gempub     (const iGempub *);
+const iString * navStartLinkUrl_Gempub  (const iGempub *); /* for convenience */
 
 extern const char *mimeType_Gempub;
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..2a4f4728 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. */
@@ -38,7 +43,7 @@ void init_Url(iUrl *d, const iString *text) {
     static iRegExp *urlPattern_;
     static iRegExp *authPattern_;
     if (!urlPattern_) {
-        urlPattern_  = new_RegExp("^(([^:/?#]+):)?(//([^/?#]*))?"
+        urlPattern_  = new_RegExp("^(([-.+a-z0-9]+):)?(//([^/?#]*))?"
                                  "([^?#]*)(\\?([^#]*))?(#(.*))?",
                                  caseInsensitive_RegExpOption);
         authPattern_ = new_RegExp("(([^@]+)@)?(([^:\\[\\]]+)"
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..5a5a4f84 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -298,10 +298,12 @@ struct Impl_DocumentWidget {
 
 iDefineObjectConstruction(DocumentWidget)
 
+static int docEnum_ = 0;
+
 void init_DocumentWidget(iDocumentWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
-    setId_Widget(w, "document000");
+    setId_Widget(w, format_CStr("document%03d", ++docEnum_));
     setFlags_Widget(w, hover_WidgetFlag, iTrue);
     init_PersistentDocumentState(&d->mod);
     d->flags           = 0;
@@ -880,7 +882,7 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
     }
     /* Take away parts if it doesn't fit. */
     const int avail = bounds_Widget(as_Widget(tabButton)).size.x - 3 * gap_UI;
-    iBool setWindow = (document_App() == d);
+    iBool setWindow = (document_App() == d && isUnderKeyRoot_Widget(d));
     for (;;) {
         iString *text = collect_String(joinCStr_StringArray(title, " \u2014 "));
         if (setWindow) {
@@ -1094,6 +1096,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 +1114,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 +1142,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));
+                }
+            }
+        }
     }
 }
 
@@ -1925,7 +1955,8 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         }
         return iTrue;
     }
-    else if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "font.changed")) {
+    else if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "font.changed") ||
+             equal_Command(cmd, "keyroot.changed")) {
         /* Alt/Option key may be involved in window size changes. */
         setLinkNumberMode_DocumentWidget_(d, iFalse);
         d->phoneToolbar = findWidget_App("toolbar");
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 245b76a3..eae0432f 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -265,9 +265,10 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
             break;
         }
         case bookmarks_SidebarMode: {
-            iRegExp *homeTag = iClob(new_RegExp("\\bhomepage\\b", caseSensitive_RegExpOption));
-            iRegExp *subTag  = iClob(new_RegExp("\\bsubscribed\\b", caseSensitive_RegExpOption));
-            iRegExp *remoteSourceTag = iClob(new_RegExp("\\bremotesource\\b", caseSensitive_RegExpOption));
+            iRegExp *homeTag         = iClob(new_RegExp("\\b" homepage_BookmarkTag "\\b", caseSensitive_RegExpOption));
+            iRegExp *subTag          = iClob(new_RegExp("\\b" subscribed_BookmarkTag "\\b", caseSensitive_RegExpOption));
+            iRegExp *remoteSourceTag = iClob(new_RegExp("\\b" remoteSource_BookmarkTag "\\b", caseSensitive_RegExpOption));
+            iRegExp *linkSplitTag    = iClob(new_RegExp("\\b" linkSplit_BookmarkTag "\\b", caseSensitive_RegExpOption));
             iConstForEach(PtrArray, i, list_Bookmarks(bookmarks_App(), cmpTitle_Bookmark_, NULL, NULL)) {
                 const iBookmark *bm = i.ptr;
                 iSidebarItem *item = new_SidebarItem();
@@ -290,6 +291,10 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                         appendChar_String(&item->meta, 0x2913);
                         item->isBold = iTrue;
                     }
+                    init_RegExpMatch(&m);
+                    if (matchString_RegExp(linkSplitTag, &bm->tags, &m)) {
+                        appendChar_String(&item->meta, 0x25e7);
+                    }
                 }
                 addItem_ListWidget(d->list, item);
                 iRelease(item);
@@ -828,11 +833,15 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
                 bm->icon = 0;
             }
             else {
-                if (!hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
-                    addTag_Bookmark(bm, userIcon_BookmarkTag);
-                }
+                addTagIfMissing_Bookmark(bm, userIcon_BookmarkTag);
                 bm->icon = first_String(icon);
             }
+            addOrRemoveTag_Bookmark(bm, homepage_BookmarkTag,
+                                    isSelected_Widget(findChild_Widget(editor, "bmed.tag.home")));
+            addOrRemoveTag_Bookmark(bm, remoteSource_BookmarkTag,
+                                    isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote")));
+            addOrRemoveTag_Bookmark(bm, linkSplit_BookmarkTag,
+                                    isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit")));
             postCommand_App("bookmarks.changed");
         }
         setFlags_Widget(as_Widget(d), disabled_WidgetFlag, iFalse);
@@ -1012,6 +1021,15 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     setText_InputWidget(findChild_Widget(dlg, "bmed.icon"),
                                         collect_String(newUnicodeN_String(&bm->icon, 1)));
                 }
+                setFlags_Widget(findChild_Widget(dlg, "bmed.tag.home"),
+                                selected_WidgetFlag,
+                                hasTag_Bookmark(bm, homepage_BookmarkTag));
+                setFlags_Widget(findChild_Widget(dlg, "bmed.tag.remote"),
+                                selected_WidgetFlag,
+                                hasTag_Bookmark(bm, remoteSource_BookmarkTag));
+                setFlags_Widget(findChild_Widget(dlg, "bmed.tag.linksplit"),
+                                selected_WidgetFlag,
+                                hasTag_Bookmark(bm, linkSplit_BookmarkTag));
                 setCommandHandler_Widget(dlg, handleBookmarkEditorCommands_SidebarWidget_);
                 setFocus_Widget(findChild_Widget(dlg, "bmed.title"));
             }
diff --git a/src/ui/util.c b/src/ui/util.c
index d2f27a8b..92cf85b7 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2506,11 +2506,18 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
             const iString *tags  = text_InputWidget(findChild_Widget(editor, "bmed.tags"));
             const iString *icon  = collect_String(trimmed_String(text_InputWidget(findChild_Widget(editor, "bmed.icon"))));
             const uint32_t id    = add_Bookmarks(bookmarks_App(), url, title, tags, first_String(icon));
+            iBookmark *    bm    = get_Bookmarks(bookmarks_App(), id);
             if (!isEmpty_String(icon)) {
-                iBookmark *bm = get_Bookmarks(bookmarks_App(), id);
-                if (!hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
-                    addTag_Bookmark(bm, userIcon_BookmarkTag);
-                }
+                addTagIfMissing_Bookmark(bm, userIcon_BookmarkTag);
+            }
+            if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.home"))) {
+                addTag_Bookmark(bm, homepage_BookmarkTag);
+            }
+            if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote"))) {
+                addTag_Bookmark(bm, remoteSource_BookmarkTag);
+            }
+            if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit"))) {
+                addTag_Bookmark(bm, linkSplit_BookmarkTag);
             }
             postCommand_App("bookmarks.changed");
         }
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 00fe0f5f..67ce1345 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -1346,6 +1346,12 @@ iBool isHover_Widget(const iAnyObject *d) {
     return get_Window()->hover == d;
 }
 
+iBool isUnderKeyRoot_Widget(const iAnyObject *d) {
+    iAssert(isInstance_Object(d, &Class_Widget));
+    const iWidget *w = d;
+    return w && get_Window() && w->root == get_Window()->keyRoot;
+}
+
 iBool isSelected_Widget(const iAnyObject *d) {
     if (d) {
         iAssert(isInstance_Object(d, &Class_Widget));
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 36797210..5b6b18e1 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -232,6 +232,7 @@ iBool   isDisabled_Widget           (const iAnyObject *);
 iBool   isFocused_Widget            (const iAnyObject *);
 iBool   isHover_Widget              (const iAnyObject *);
 iBool   isSelected_Widget           (const iAnyObject *);
+iBool   isUnderKeyRoot_Widget       (const iAnyObject *);
 iBool   isCommand_Widget            (const iWidget *d, const SDL_Event *ev, const char *cmd);
 iBool   hasParent_Widget            (const iWidget *d, const iWidget *someParent);
 iBool   isAffectedByVisualOffset_Widget
diff --git a/src/ui/window.c b/src/ui/window.c
index c4d06d75..a1df2609 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1214,30 +1214,36 @@ void setSplitMode_Window(iWindow *d, int splitFlags) {
             /* Add a second root. */
             iDocumentWidget *moved = document_Root(d->roots[0]);
             iAssert(d->roots[1] == NULL);
-            d->roots[1] = new_Root();
-            setCurrent_Root(d->roots[1]);
-            d->keyRoot = d->roots[1];
-            createUserInterface_Root(d->roots[1]);
+            const iBool addToLeft = (prefs_App()->pinSplit == 2);
+            size_t newRootIndex = 1;
+            if (addToLeft) {
+                iSwap(iRoot *, d->roots[0], d->roots[1]);
+                newRootIndex = 0;
+            }
+            d->roots[newRootIndex] = new_Root();
+            d->keyRoot             = d->roots[newRootIndex];
+            setCurrent_Root(d->roots[newRootIndex]);
+            createUserInterface_Root(d->roots[newRootIndex]);
             if (!isEmpty_String(d->pendingSplitUrl)) {
-                postCommandf_Root(d->roots[1], "open url:%s",
+                postCommandf_Root(d->roots[newRootIndex], "open url:%s",
                                   cstr_String(d->pendingSplitUrl));
                 clear_String(d->pendingSplitUrl);
             }
             else if (~splitFlags & noEvents_WindowSplit) {
-                iWidget *docTabs0 = findChild_Widget(d->roots[0]->widget, "doctabs");
-                iWidget *docTabs1 = findChild_Widget(d->roots[1]->widget, "doctabs");
+                iWidget *docTabs0 = findChild_Widget(d->roots[newRootIndex ^ 1]->widget, "doctabs");
+                iWidget *docTabs1 = findChild_Widget(d->roots[newRootIndex]->widget, "doctabs");
                 /* If the old root has multiple tabs, move the current one to the new split. */
                 if (tabCount_Widget(docTabs0) >= 2) {
                     int movedIndex = tabPageIndex_Widget(docTabs0, moved);
                     removeTabPage_Widget(docTabs0, movedIndex);
                     showTabPage_Widget(docTabs0, tabPage_Widget(docTabs0, iMax(movedIndex - 1, 0)));
                     iRelease(removeTabPage_Widget(docTabs1, 0)); /* delete the default tab */
-                    setRoot_Widget(as_Widget(moved), d->roots[1]);
+                    setRoot_Widget(as_Widget(moved), d->roots[newRootIndex]);
                     prependTabPage_Widget(docTabs1, iClob(moved), "", 0, 0);
                     postCommandf_App("tabs.switch page:%p", moved);
                 }
                 else {
-                    postCommand_Root(d->roots[1], "navigate.home");
+                    postCommand_Root(d->roots[newRootIndex], "navigate.home");
                 }
             }
             setCurrent_Root(NULL);