@@ -32,21 +32,21 @@
 ;; will be coming from me.
 
 (require pollen/setup
          pollen/core
          pollen/template
-         pollen/pagetree
          racket/string
          txexpr
          "sqlite-tools.rkt"
          "template-html.rkt"
          "dust.rkt")
 
 ;; ~~~ Provides ~~~
 
 (provide spell-of-summoning!
-         crystalize-article!)
+         crystalize-article!
+         article-plain-title)
 
 ;; ~~~ Private use ~~~
 
 (define DBFILE (build-path (current-project-root) "vitreous.sqlite"))
 
@@ -57,10 +57,11 @@
 ;;
 (define table_articles-fields
   '(pagenode
     title_plain
     title_html_flow
+    title_specified
     published
     updated
     author
     conceal
     series_pagenode
@@ -118,14 +119,15 @@
   (define-values (body-txpr note-txprs) (doc->body/notes doc))
   (define doc-html (->html (cdr body-txpr)))
   
   (define-values (disposition disp-note-id)
     (notes->last-disposition-values note-txprs))
+  (define title-specified? (non-empty-string? (maybe-meta 'title)))
   (define-values (title-plain title-html-flow)
-    (make-article-titles (maybe-meta 'title (default-title pubdate)) disposition))
+    (title-plain+html-values body-txpr disposition))
   (define series-node (maybe-meta 'series))
-  (define header (html$-article-open title-html-flow pubdate))
+  (define header (html$-article-open title-specified? title-html-flow pubdate))
 
   (define footertext (make-article-footertext pagenode series-node disposition disp-note-id (length note-txprs)))
   (define footer (html$-article-close footertext))
   
   (define notes-section-html (crystalize-notes! pagenode title-plain note-txprs))
@@ -133,10 +135,11 @@
   ;; Values must come in the order defined in table_article_fields
   (define article-record
     (list (symbol->string pagenode)
           title-plain
           title-html-flow
+          (bool->int title-specified?)
           pubdate
           (maybe-meta 'updated)
           (maybe-meta 'author default-authorname)
           (maybe-meta 'conceal)
           series-node
@@ -154,12 +157,19 @@
   ◊string-append{◊header ◊doc-html ◊notes-section-html ◊footer})
 
 ;; ~~~ Article-related helper functions ~~~
 ;;
 
-;; Given a disposition and title, return both a plain-text and HTML version of the title
-(define (make-article-titles title-val disposition)
+;; Return both a plain-text and HTML version of a title for the current article,
+;; supplying a default if no title was specified in the metas.
+(define (title-plain+html-values body-tx disposition)
+  (define title (maybe-meta 'title ""))
+  (define title-val
+    (cond [(and (string? title) (string=? title ""))
+           (format "“~a…”" (first-words (tx-strs body-tx) 5))]
+          [else title]))
+  
   (define disposition-part
     (cond [(non-empty-string? disposition)
            (define-values (mark _) (disposition-values disposition))
            (format "<span class=\"disposition-mark\">~a</span>" mark)]
           [else ""]))
@@ -266,5 +276,8 @@
             (list->sql-parameters table_notes-fields)))
   (apply query! save-note-query note-record)
   
   ;; return html$ of note
   (html$-note-in-article note-id note-date content-html author author-url))
+
+(define (article-plain-title pagenode)
+  (query-value (sqltools:dbc) "SELECT `title_plain` FROM `articles` WHERE `pagenode` = ?1" (symbol->string pagenode)))