From e1d6e4678da17784c54f86eb2bf67a61bc385969 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Sat, 15 Jun 2024 21:25:29 -0500
Subject: Fix html filters

---
 lib/html.scm | 63 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

(limited to 'lib')

diff --git a/lib/html.scm b/lib/html.scm
index 26cdff4..9ed5957 100644
--- a/lib/html.scm
+++ b/lib/html.scm
@@ -28,37 +28,36 @@
       (char->tag "`" "code")) s))
 
 (set-formats!
-  '((para (line . "~a~%")
-          (stanza . "<p>~% ~a</p>~%"))
-    (verb (line . "~a~%")
-          (stanza . "<pre><code>~a</code></pre>~%"))
-    (link (line . "<li><a href=\"~a\">~a</a></li>~%")
-          (stanza . "<ul>~% ~a</ul>~%")
-          (inline . "<a href=\"~a\">~a</a>~%"))
-    (list (line . "<li>~a</li>~%")
-          (stanza . "<ul>~% ~a</ul>~%"))
-    (quot (line . "~a~%")
-          (stanza . "<blockquote>~% ~a</blockquote>~%"))
-    (hdr1 (line . "~a")
-          (stanza . "<h1>~a</h1>~%"))
-    (hdr2 (line . "~a")
-          (stanza . "<h2>~a</h2>~%"))
-    (hdr3 (line . "~a")
-          (stanza . "<h3>~a</h3>~%"))))
+ '((para (line . "~a~%")
+         (stanza . "<p>~% ~a</p>~%"))
+   (verb (line . "~a~%")
+         (stanza . "<pre><code>~a</code></pre>~%"))
+   (link (line . "<li><a href=\"~a\">~a</a></li>~%")
+         (stanza . "<ul>~% ~a</ul>~%")
+         (inline . "<a href=\"~a\">~a</a>~%"))
+   (list (line . "<li>~a</li>~%")
+         (stanza . "<ul>~% ~a</ul>~%"))
+   (quot (line . "~a~%")
+         (stanza . "<blockquote>~% ~a</blockquote>~%"))
+   (hdr1 (line . "~a")
+         (stanza . "<h1>~a</h1>~%"))
+   (hdr2 (line . "~a")
+         (stanza . "<h2>~a</h2>~%"))
+   (hdr3 (line . "~a")
+         (stanza . "<h3>~a</h3>~%"))))
 
 (set-filters!
-  `((verb (line . ,identity)
-          (stanza . ,join-lines))
-    (link (line . ,(lambda (ln)
-                     (cons (car ln)
-                           ((o list
-                               add-inline-markup
-                               escape-entities
-                               string-join)
-                            (cdr ln))))))
-    (default
-      (line . ,(o list
-                  add-inline-markup
-                  escape-entities
-                  string-join))
-      (stanza . ,string-join))))
+ `((verb (stanza . ,(o ensure-newline (cut string-join <> "\n"))))
+   (link (line . ,(lambda (ln)
+                    (cons (car ln)
+                          ((o list
+                              add-inline-markup
+                              escape-entities
+                              string-join)
+                           (cdr ln))))))
+   (default
+     (line . ,(o list
+                 add-inline-markup
+                 escape-entities
+                 string-join))
+     (stanza . ,string-join))))
-- 
cgit 1.4.1-21-gabe81