X-Git-Url: http://git.kpe.io/?p=lml.git;a=blobdiff_plain;f=2%2Fbase.lisp;h=ee6598eb231bbd57e3a36311f90e788b939f27d7;hp=3105af84ffe03582be33f657d22472d0eebbfdba;hb=56101303de2ecd982a094e354a4d4d2eb1547d81;hpb=21657b49ea30c2d34d598258257fea8ec06fff31

diff --git a/2/base.lisp b/2/base.lisp
index 3105af8..ee6598e 100644
--- a/2/base.lisp
+++ b/2/base.lisp
@@ -7,28 +7,21 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: base.lisp,v 1.2 2003/06/20 04:46:54 kevin Exp $
+;;;; $Id: base.lisp,v 1.7 2003/07/12 17:54:05 kevin Exp $
 ;;;;
-;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of LML2, is Copyright (c) 2000-2003 by Kevin Rosenberg.
+;;;; Rights of modification and redistribution are in the LICENSE file.
 ;;;;
-;;;; LML users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the GNU General Public License v2
-;;;; (http://www.gnu.org/licenses/gpl.html)
 ;;;; *************************************************************************
 
 (in-package #:lml2)
 
 
-(defun reset-indent ()
-  (setq *indent* 0))
-
 (defun lml-format (str &rest args)
   (when (streamp *html-stream*)
-    (when *print-spaces* (indent-spaces *indent* *html-stream*))
     (if args
 	(apply #'format *html-stream* str args)
-      (write-string str *html-stream*))
-    (when *print-spaces* (write-char #\newline *html-stream*))))
+	(write-string str *html-stream*))))
 
 (defun lml-princ (s)
   (princ s *html-stream*))
@@ -45,29 +38,35 @@
 (defun lml-print-date (date)
   (lml-write-string (date-string date)))
 
-(defmacro xhtml-prologue ()
-  `(progn
-     (lml-write-string (xml-prologue-string))
-     (lml-write-char #\newline)
-     (lml-write-string (xhtml-prologue-string))
+(defun dtd-prologue (&optional (format :xhtml11))
+  (case format
+    ((:xhtml :xhtml11 :xhtml10-strict :xhtml10-transitional :xhtml10-frameset :xml)
+     (lml-write-string +xml-prologue-string+)
      (lml-write-char #\newline)))
-
-(defmacro print-page (title &body body)
-  `(html
-    (:head
-     (:title (:princ ,title)))
-    (:body ,@body)))
-
-(defmacro page (out-file &body body)
+  (case format
+    ((:xhtml11 :xhtml)
+     (lml-write-string +xhtml11-dtd-string+))
+    (:xhtml10-strict
+     (lml-write-string +xhtml10-strict-dtd-string+))
+    (:xhtml10-transitional
+     (lml-write-string +xhtml10-transitional-dtd-string+))
+    (:xhtml10-frameset
+     (lml-write-string +xhtml10-frameset-dtd-string+))
+    (:html
+     (lml-write-string +html4-dtd-string+)))
+  (lml-write-char #\newline))
+
+
+(defmacro html-file-page ((out-file &key (format :xhtml11))
+			  &body body)
   `(with-open-file (*html-stream*
 		    (lml-file-name ,out-file :output)
 		    :direction :output
 		    :if-exists :supersede)
-     (xhtml-prologue)
+     (dtd-prologue ,format)
      (html
       ((:html :xmlns "http://www.w3.org/1999/xhtml")
        ,@body))))
-
 		     
 
 (defmacro alink (url desc)
@@ -77,5 +76,3 @@
 (defmacro alink-c (class url desc)
   `(html
     ((:a :class ,class :href ,url) ,desc)))
-
-(export '(alink alink-c))