4 files changed, 16 insertions, 1 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index eb147925..f1f63b29 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -28,6 +28,7 @@ struct Impl_GmDocument {
     iInt2 size;
     iArray layout; /* contents of source, laid out in document space */
     iPtrArray links;
+    iString title; /* the first top-level title */
 };
 
 iDefineObjectConstruction(GmDocument)
@@ -166,6 +167,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     static const char *bullet = "\u2022";
     clear_Array(&d->layout);
     clearLinks_GmDocument_(d);
+    clear_String(&d->title);
     if (d->size.x <= 0 || isEmpty_String(&d->source)) {
         return;
     }
@@ -242,6 +244,10 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                 pos.y += required - delta;
             }
         }
+        /* Document title. */
+        if (type == header1_GmLineType && isEmpty_String(&d->title)) {
+            setRange_String(&d->title, line);
+        }
         /* List bullet. */
         run.color = colors[type];
         if (type == bullet_GmLineType) {
@@ -289,9 +295,11 @@ void init_GmDocument(iGmDocument *d) {
     d->size = zero_I2();
     init_Array(&d->layout, sizeof(iGmRun));
     init_PtrArray(&d->links);
+    init_String(&d->title);
 }
 
 void deinit_GmDocument(iGmDocument *d) {
+    deinit_String(&d->title);
     clearLinks_GmDocument_(d);
     deinit_PtrArray(&d->links);
     deinit_Array(&d->layout);
@@ -410,4 +418,8 @@ const iString *linkUrl_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
     return NULL;
 }
 
+const iString *title_GmDocument(const iGmDocument *d) {
+    return &d->title;
+}
+
 iDefineClass(GmDocument)
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 959c75ea..22e614ea 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -30,3 +30,4 @@ iInt2   size_GmDocument         (const iGmDocument *);
 
 const iGmRun *  findRun_GmDocument  (const iGmDocument *, iInt2 pos);
 const iString * linkUrl_GmDocument  (const iGmDocument *, iGmLinkId linkId);
+const iString * title_GmDocument    (const iGmDocument *);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 030a323b..cb530e9b 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -140,6 +140,9 @@ static void updateSource_DocumentWidget_(iDocumentWidget *d) {
     deinit_String(&str);
     updateVisible_DocumentWidget_(d);
     refresh_Widget(as_Widget(d));
+    setTitle_Window(get_Window(),
+                    !isEmpty_String(title_GmDocument(d->doc)) ? title_GmDocument(d->doc)
+                                                              : collectNewCStr_String("Lagrange"));
 }
 
 static void fetch_DocumentWidget_(iDocumentWidget *d) {
diff --git a/src/ui/window.c b/src/ui/window.c
index 6196a638..a110c5ad 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -90,7 +90,6 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     else if (equal_Command(cmd, "document.changed")) {
         iInputWidget *url = findWidget_App("url");
         setTextCStr_InputWidget(url, valuePtr_Command(cmd, "url"));
-        setTitle_Window(get_Window(), text_InputWidget(url));
         updateTextCStr_LabelWidget(findChild_Widget(navBar, "reload"), reloadCStr_);
         return iFalse;
     }