r10296: Automated commit for Debian build of lml2 upstream-version-1.5.2

diff --git a/debian/changelog b/debian/changelog
index 61a34877afbef175b5f10f6f2a16e0004c23e670..74f806e98c2f2dd86ebeea609e409342a13ad304 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-lml2 (1.5.2-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 28 Jan 2005 19:09:07 -0700
+
 cl-lml2 (1.5.1-1) unstable; urgency=low
 
   * New upstream

diff --git a/files.lisp b/files.lisp
index 445e5487c63b15e948d338b2dd2ba210ed4b6675..a3dbf6ee34fee826e1df9c29d77bdf1ac6907f09 100644 (file)
--- a/files.lisp
+++ b/files.lisp
@@ -19,26 +19,25 @@
   (defvar *sources-dir* nil)
   )
 
-(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*
-       (merge-pathnames
-        (make-pathname :name `,(pathname-name f)
-                       :type `,(pathname-type f)
-                       :directory `,(pathname-directory f))
-        (ecase type
-          (:source *sources-dir*)
-          (:output *output-dir*)))
+(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*
+      (merge-pathnames
+       (make-pathname :name (pathname-name f)
+                     :type (pathname-type f)
+                     :directory (pathname-directory f))
+       (ecase type
+        (:source *sources-dir*)
+        (:output *output-dir*)))
       (if (stringp f)
          (parse-namestring f)
-       f))))
+         f)))
 
 (defmacro with-dir ((output &key sources) &body body)
   (let ((output-dir (gensym))

diff --git a/stdsite.lisp b/stdsite.lisp
index aef383be5f87f02032b5eb4cc0c97d0bf934423c..d15ea00a1a990ffc65096d22ab99aad2ea354540 100644 (file)
--- a/stdsite.lisp
+++ b/stdsite.lisp
@@ -72,7 +72,7 @@
 (defmacro std-page ((out-file title &key (format :xhtml11))
                    &body body)
   `(let ((*indent* 0))
-     (with-open-file (*html-stream* (lml-file-name ,out-file :output)
+     (with-open-file (*html-stream* (lml-file-name ',out-file :output)
                      :direction :output
                      :if-exists :supersede)
        (print-std-page (lml-file-name ,out-file :source) ,title ,format ,@body))))