r5219: *** empty log message ***

diff --git a/2/base.lisp b/2/base.lisp
index 655ba80f961288d6b781bbdd5e9c372ae56d5cc4..01b3c7666e6b0565b60fd635654a083aef4b9ef3 100644 (file)
--- a/2/base.lisp
+++ b/2/base.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: base.lisp,v 1.5 2003/06/24 17:48:41 kevin Exp $
+;;;; $Id: base.lisp,v 1.6 2003/06/29 16:21:09 kevin Exp $
 ;;;;
 ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -64,8 +64,8 @@
   (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

diff --git a/2/htmlgen.lisp b/2/htmlgen.lisp
index f77b6b6a344d94aef7256c16978cba53d7652d3b..387ba8bfd73ee60c5316a1866895a4e080e77f33 100644 (file)
--- a/2/htmlgen.lisp
+++ b/2/htmlgen.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: lml2 -*-
 ;;
-;; $Id: htmlgen.lisp,v 1.10 2003/06/25 21:24:09 kevin Exp $
+;; $Id: htmlgen.lisp,v 1.11 2003/06/29 16:21:09 kevin Exp $
 ;;
 ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA 
 ;; copyright (c) 2003 Kevin Rosenberg
@@ -750,7 +750,7 @@
        (unless body
          (error "must have a body with :insert-file"))
        `(progn ,@(mapcar #'(lambda (bod)
-                             `(lml-load-path ,bod))
+                             `(lml-load ,bod))
                          body))))
   
   (named-function html-nbsp-print-function
@@ -758,7 +758,7 @@
       (declare (ignore ent unknown subst stream args))
       (assert (eql 2 (length form)))
       (if (eq cmd :full)
-         (lml-load-path (cadr form))
+         (lml-load (cadr form))
          (error ":insert-file must be given an argument")))))
 
 

diff --git a/2/package.lisp b/2/package.lisp
index 857a82c86443218c24b458f0d8960677a1b93242..d24686305f595989c977f7fc6d4a4299b7a0a46d 100644 (file)
--- a/2/package.lisp
+++ b/2/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  June 2003
 ;;;;
-;;;; $Id: package.lisp,v 1.3 2003/06/23 23:58:29 kevin Exp $
+;;;; $Id: package.lisp,v 1.4 2003/06/29 16:21:09 kevin Exp $
 ;;;;
 ;;;; This file, part of LML2, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -29,7 +29,7 @@
    
    ;; base.lisp
    #:reset-indent
-   #:page
+   #:html-file-page
    #:dtd-prologue
    #:lml-format
    #:lml-print