r10297: Automated commit for Debian build of lml upstream-version-2.5.3

diff --git a/debian/changelog b/debian/changelog
index 9ba3b1e1eff3386abe631c8853e63184e7dc5b78..5231f403a1549223700674e86120214c653120e0 100644 (file)
--- 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)
 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 3ee14023b539a9afeb7fd1250b033f3d99e2d8e4..3f17f3689385ef7873d8b35f9a645d7506c3f7a0 100644 (file)
--- a/doc/make.lisp
+++ b/doc/make.lisp
@@ -1,7 +1,7 @@
 #+cmu (setq ext:*gc-verbose* nil)
 
 #+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)
 (let ((cwd (parse-namestring (lml-cwd))))
   (process-dir cwd))
 (lml-quit)

diff --git a/files.lisp b/files.lisp
index cf1633f736eb1d63a2811f00989bb92d3d4bf285..fe3c4261a85004f4cd08d6245e728127ed979af5 100644 (file)
--- a/files.lisp
+++ b/files.lisp
@@ -23,24 +23,23 @@
 
 (defvar *html-output* *standard-output*)
 
 
 (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)
       (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))
 
 (defmacro with-dir ((output &key sources) &body body)
   (let ((output-dir (gensym))

diff --git a/stdsite.lisp b/stdsite.lisp
index 006fe51df98c411397c070c206fc1725506d59d9..041140dc426be37134339a92b60314bd6788334b 100644 (file)
--- a/stdsite.lisp
+++ b/stdsite.lisp
@@ -68,7 +68,7 @@
 
 (defmacro std-page (out-file title &body body)
   `(let ((*indent* 0))
 
 (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))))
                      :direction :output
                      :if-exists :supersede)
        (print-std-page (lml-file-name ,out-file :source) ,title ,@body))))