From b9f59638a12167ca983c8989e48d162cc9f48772 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Sat, 29 Jan 2005 02:10:28 +0000
Subject: [PATCH] r10297: Automated commit for Debian build of lml
 upstream-version-2.5.3

---
 debian/changelog |  6 ++++++
 doc/make.lisp    |  4 ++--
 files.lisp       | 33 ++++++++++++++++-----------------
 stdsite.lisp     |  2 +-
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ba3b1e..5231f40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-lml (2.5.3-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 28 Jan 2005 19:08:44 -0700
+
 cl-lml (2.5.2.1-1) unstable; urgency=low
 
   * Update description (closes:209608)
diff --git a/doc/make.lisp b/doc/make.lisp
index 3ee1402..3f17f36 100644
--- a/doc/make.lisp
+++ b/doc/make.lisp
@@ -1,7 +1,7 @@
 #+cmu (setq ext:*gc-verbose* nil)
 
-(require :lml)
-(in-package :lml)
+(asdf:operate 'asdf:load-op 'lml)
+(in-package lml)
 (let ((cwd (parse-namestring (lml-cwd))))
   (process-dir cwd))
 (lml-quit)
diff --git a/files.lisp b/files.lisp
index cf1633f..fe3c426 100644
--- a/files.lisp
+++ b/files.lisp
@@ -23,24 +23,23 @@
 
 (defvar *html-output* *standard-output*)
 
-(defmacro lml-file-name (file &optional (type :source))
-  (let ((f file))
-    (when (and (consp f) (eql (car f) 'cl:quote))
-      (setq f (cadr f)))
-    (when (symbolp f)
-      (setq f (string-downcase (symbol-name f))))
-    (when (stringp f)
-      (unless (position #\. f)
-	(setq f (concatenate 'string f ".html"))))
-    (if *sources-dir*
-	(make-pathname :defaults (ecase type
-				   (:source *sources-dir*)
-				   (:output *output-dir*))
-		       :name `,(pathname-name f)
-		       :type `,(pathname-type f))
+(defun lml-file-name (f &optional (type :source))
+  (when (and (consp f) (eql (car f) 'cl:quote))
+    (setq f (cadr f)))
+  (when (symbolp f)
+    (setq f (string-downcase (symbol-name f))))
+  (when (stringp f)
+    (unless (position #\. f)
+      (setq f (concatenate 'string f ".html"))))
+  (if *sources-dir*
+      (make-pathname :defaults (ecase type
+				 (:source *sources-dir*)
+				 (:output *output-dir*))
+		     :name (pathname-name f)
+		     :type (pathname-type f))
       (if (stringp f)
-	  (parse-namestring f)
-	f))))
+	  (nth-value 0 (parse-namestring f))
+	  f)))
 
 (defmacro with-dir ((output &key sources) &body body)
   (let ((output-dir (gensym))
diff --git a/stdsite.lisp b/stdsite.lisp
index 006fe51..041140d 100644
--- a/stdsite.lisp
+++ b/stdsite.lisp
@@ -68,7 +68,7 @@
 
 (defmacro std-page (out-file title &body body)
   `(let ((*indent* 0))
-     (with-open-file (*html-output* (lml-file-name ,out-file :output)
+     (with-open-file (*html-output* (lml-file-name ',out-file :output)
 		      :direction :output
 		      :if-exists :supersede)
        (print-std-page (lml-file-name ,out-file :source) ,title ,@body))))
-- 
2.34.1