From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sun, 29 Jun 2003 16:22:11 +0000 (+0000)
Subject: r5219: *** empty log message ***
X-Git-Tag: v1.6.2~51
X-Git-Url: http://git.kpe.io/?p=lml2.git;a=commitdiff_plain;h=baab0724ae6b89da695994a9ca394b47a0559dc4

r5219: *** empty log message ***
---

diff --git a/base.lisp b/base.lisp
index 655ba80..01b3c76 100644
--- a/base.lisp
+++ b/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/htmlgen.lisp b/htmlgen.lisp
index f77b6b6..387ba8b 100644
--- a/htmlgen.lisp
+++ b/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/package.lisp b/package.lisp
index 857a82c..d246863 100644
--- a/package.lisp
+++ b/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