X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=2%2Fbase.lisp;h=517af2cc834fcf336e2db5be3d96930d43d56021;hb=2dcfda178f817bec62b9f51248d96799d254d686;hp=0274c35b25320dc718da2738d5bffa12d34c8bd0;hpb=57df6eefa6b83ff8dede355af9b7a00acfef6adc;p=lml.git

diff --git a/2/base.lisp b/2/base.lisp
index 0274c35..517af2c 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.4 2003/06/23 23:58:29 kevin Exp $
+;;;; $Id$
 ;;;;
-;;;; 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,36 +38,43 @@
 (defun lml-print-date (date)
   (lml-write-string (date-string date)))
 
-(defun dtd-prologue (&optional (format :xhtml11))
+(defun dtd-prologue (&optional (format :xhtml11) &key entities)
   (case format
     ((:xhtml :xhtml11 :xhtml10-strict :xhtml10-transitional :xhtml10-frameset :xml)
      (lml-write-string +xml-prologue-string+)
-     (lml-write-char #\newline)))
-  (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+))
+     (lml-write-char #\newline)
+     (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+)))
+     (when entities
+       (lml-write-char #\space)
+       (lml-write-char #\[)
+       (lml-write-char #\Newline)
+       (lml-write-string entities)
+       (lml-write-char #\Newline)
+       (lml-write-char #\]))
+     (lml-write-char #\>))
     (:html
      (lml-write-string +html4-dtd-string+)))
   (lml-write-char #\newline))
 
 
-(defmacro page ((out-file &key (format :xhtml11))
-		&body body)
+(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)
-     (html-prologue ,format)
+     (dtd-prologue ,format)
      (html
       ((:html :xmlns "http://www.w3.org/1999/xhtml")
        ,@body))))
-
 		     
 
 (defmacro alink (url desc)