Fix verbatim processing fully

No more special-casing on the surface of the code; that is, the filter expects a list of strings and outputs a single string, etc.

2 files changed, 8 insertions, 5 deletions

@@ -84,7 +84,7 @@
     (printf (get-format 'verb 'stanza)
             ((get-filter 'verb 'stanza) t)))
   (let ((el (car stanza))
-        (text (string-join (apply append (cdr stanza)) "\n")))
+        (text (apply append (cdr stanza))))
     (with-output-to-string
       (lambda ()
         (cond
@@ -98,12 +98,13 @@
                     (process command (cdr cmdline)
                              (cons `("JIMMY_OUTPUT" . ,(->string (output-type)))
                                    (get-environment-variables)))
-                  (display (ensure-newline text) out)
+                  (display ((o ensure-newline (cut string-join <> "\n")) text)
+                           out)
                   (close-output-port out)
                   (display (read-string #f in))
                   (newline))
-                (emit-verbatim t))))
-         (else (emit-verbatim t)))))))
+                (emit-verbatim text))))
+         (else (emit-verbatim text)))))))
 
 ;;; Utilities
 
@@ -48,7 +48,9 @@
          (stanza . "<h3>~a</h3>~%"))))
 
 (set-filters!
- `((verb (stanza . ,(o ensure-newline (cut string-join <> "\n"))))
+ `((verb (stanza . ,(o ensure-newline
+                       escape-entities
+                       (cut string-join <> "\n"))))
    (link (line . ,(lambda (ln)
                     (cons (car ln)
                           ((o list