From: Tim Vaughan <plugd@thelambdalab.xyz>
Date: Fri, 22 May 2020 16:08:07 +0000 (+0200)
Subject: Fixed reflow behaviour around bullets.
X-Git-Tag: v2.7.7~1
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=commitdiff_plain;h=4a477550ca8d932e0708b961be515b0a64aeef69

Fixed reflow behaviour around bullets.

Previously, consecutive lines containing bullets could result in
bullets being added, because of emacs' default auto-fill behaviour.
(Which makes sense when editing text, but not when formatting gemini
documents.)
---

diff --git a/elpher.el b/elpher.el
index ca076d0..b169f76 100644
--- a/elpher.el
+++ b/elpher.el
@@ -1146,6 +1146,18 @@ by HEADER-LINE."
                             (_ 'default)))
               "\n"))))
 
+(defun elpher-gemini-insert-text (text-line)
+  "Insert a plain non-preformatted TEXT-LINE into a text/gemini document.
+This function uses Emacs' auto-fill to wrap text sensibly to a maximum
+width defined by elpher-gemini-max-fill-width."
+  (insert (elpher-process-text-for-display text-line))
+  (let* ((prefix-end-idx (string-match "[^ \t*]" text-line))
+         (fill-prefix (if prefix-end-idx
+                          (let ((raw-prefix (substring text-line 0 prefix-end-idx)))
+                            (replace-regexp-in-string "\*" " " raw-prefix))
+                        nil)))
+    (newline)))
+
 (defun elpher-render-gemini-map (data _parameters)
   "Render DATA as a gemini map file, PARAMETERS is currently unused."
   (elpher-with-clean-buffer
@@ -1160,7 +1172,7 @@ by HEADER-LINE."
                               "\n"))
         ((string-prefix-p "=>" line) (elpher-gemini-insert-link line))
         ((string-prefix-p "#" line) (elpher-gemini-insert-header line))
-        (t (insert (elpher-process-text-for-display line)) (newline)))))
+        (t (elpher-gemini-insert-text line)))))
    (elpher-cache-content
     (elpher-page-address elpher-current-page)
     (buffer-string))))