1 files changed, 4 insertions, 6 deletions

@@ -26,7 +26,7 @@
         (def (cdr (assoc 'default line-types))))
     (cond
      ((null? lin) def)                             ; empty line
-     ((assoc (car lin) line-types) => cdr)         ; a line type exists
+     ((assoc (car lin) line-types) => cdr)         ; a known line type
      (else def))))                                 ; otherwise ...
 
 (define (parse-lines lines doc)
@@ -48,10 +48,8 @@
           ;;;; FIXME: I think this necessitates a special emit-verbatim
           ;;;; function.
           (parse-verbatim (cdr lines) doc '()
-                   #;       (if (< 1 (length words))
-                              (cons 'verb (cdr words))
-                          'verb)
-                          'verb))
+                          ;;; FIXME
+                          (cons 'verb (cdr words))))
          (else                                     ; another line type
           (apply parse-stanza lines doc '() (line-type words)))))))
 
@@ -67,7 +65,7 @@
 
 (define (parse-stanza lines doc stanza st-type
                       #!optional (st-inlines '()) (st-words cdr))
-  (define (close-stanza) (cons (cons st-type (reverse stanza)) doc))
+  (define (close-stanza) (cons (cons (list st-type) (reverse stanza)) doc))
   (if (null? lines)                                ; end of document
       (parse-lines lines (close-stanza))
       (let* ((ln (car lines))