Index: stml2.scm
==================================================================
--- stml2.scm
+++ stml2.scm
@@ -178,10 +178,11 @@
 (define (s:head   . args) (s:common-tag "HEAD"   args))
 (define (s:html   . args) (s:common-tag "HTML"   args))
 (define (s:i      . args) (s:common-tag "I"      args))
 (define (s:img    . args) (s:common-tag "IMG"    args))
 (define (s:input  . args) (s:common-tag "INPUT"  args))
+(define (s:output . args) (s:common-tag "OUTPUT" args))
 (define (s:link   . args) (s:common-tag "LINK"   args))
 (define (s:p      . args) (s:common-tag "P"      args))
 (define (s:strong . args) (s:common-tag "STRONG" args))
 (define (s:table  . args) (s:common-tag "TABLE"  args))
 (define (s:tbody  . args) (s:common-tag "TBODY"  args))
@@ -1335,13 +1336,13 @@
    (else     #f)))
 
 ;; Moved from stmlcommon
 ;;
 (define (s:cgi-out inlst)
-  (s:output (current-output-port) inlst))
+  (s:output-new (current-output-port) inlst))
 
-(define (s:output port inlst)
+#;(define (s:output port inlst)
   (map (lambda (x)
 	 (cond 
 	  ((string? x) (print x)) ;; (print x))
 	  ((symbol? x) (print x)) ;; (print x))
 	  ((list? x)   (s:output port x))
@@ -1357,11 +1358,11 @@
       (lambda ()
 	(map (lambda (x)
 	       (cond 
 		((string? x) (print x))
 		((symbol? x) (print x))
-		((list? x)   (s:output port x))
+		((list? x)   (s:output-new port x))
 		(else
 		 ;; (print "ERROR: Bad input 03")
      )))
 	     inlst))))
            
@@ -2341,11 +2342,13 @@
 
 ;; This one will get the first value found regardless of form
 (define (session:get-input-keys self)
   (let* ((formdat (sdat-formdat self)))
     (if (not formdat) #f
-	(if (and (vector? formdat)(eq? (vector-length formdat) 1)(hash-table? (vector-ref formdat 0)))
+	(if (and (vector? formdat)
+		 (eq? (vector-length formdat) 1)
+		 (hash-table? (vector-ref formdat 0)))
 	    (formdat:keys formdat)
 	    (begin
 	      (session:log self "ERROR: formdat: " formdat " is not of class <formdat>")
 	      #f)))))