(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))))
(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*))