r8596: lml2 rework

[lml2.git] / files.lisp

diff --git a/files.lisp b/files.lisp
index 9045cb4fc5a87728f124b0149680bae8c3899309..445e5487c63b15e948d338b2dd2ba210ed4b6675 100644 (file)
--- a/files.lisp
+++ b/files.lisp
@@ -2,16 +2,14 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          files.cl
+;;;; Name:          files.lisp
 ;;;; Purpose:       File and directory functions for LML
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; This file, part of LML2, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of LML2, is Copyright (c) 2000-2003 by Kevin Rosenberg.
+;;;; Rights of modification and redistribution are in the LICENSE file.
 ;;;;
-;;;; LML2 users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the GNU General Public License v2
-;;;; (http://www.gnu.org/licenses/gpl.html)
 ;;;; *************************************************************************
 
 (in-package #:lml2)
@@ -31,11 +29,13 @@
       (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))
+       (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))))
@@ -76,5 +76,5 @@
 (defun lml-load (file)
   (lml-load-path (eval `(lml-file-name ,file :source))))
 
-(defun include-file (file)
+(defun insert-file (file)
   (print-file-contents file *html-stream*))