[cl-pdf-devel] Pathname patch for cl-pdf and MCL

[Gary King]

I'm not sure if the first patch I sent made it through (or if I sent  
it correctly). This allows cl-pdf to load under MCL. It changes three  
pathname related calls to use merge-pathnames and make-pathnames.

Index: cl-pdf.asd
===================================================================
--- cl-pdf.asd	(revision 113)
+++ cl-pdf.asd	(working copy)
@@ -22,10 +22,29 @@
    (pushnew :uffi cl:*features*)
    (print "UFFI loaded."))
-(load (merge-pathnames "iterate/iterate.asd" *load-truename*))
+(or (and (find-system 'iterate)
+         (or (operate 'load-op 'iterate)
+             (gethash 'load-op (component-operation-times (find- 
system 'iterate)))))
+    (let ((asdf-file (merge-pathnames
+                      (make-pathname
+                       :name "iterate"
+                       :type "asd"
+                       :directory '(:relative "iterate"))
+                      *load-truename*)))
+      (unless (and (probe-file asdf-file)
+                   (load asdf-file))
+        (error "Unable to find or load the iterate system"))))
#+use-salza-zlib
-(load (merge-pathnames "salza/salza.asd" *load-truename*))
+(let ((asdf-file (merge-pathnames
+                  (make-pathname
+                   :name "salza"
+                   :type "asd"
+                   :directory '(:relative "salza"))
+                  *load-truename*)))
+  (unless (and (probe-file asdf-file)
+               (load asdf-file))
+    (error "You've pushed :use-salza-zlib onto *features* and I'm  
unable to load salza!")))
#+clisp (setf *warn-on-floating-point-contagion* nil)
Index: config.lisp
===================================================================
--- config.lisp	(revision 113)
+++ config.lisp	(working copy)
@@ -32,7 +32,12 @@
;; The *afm-files-directories* is only for the 14 predefined fonts.
;; other fonts must have their afm files read only when they are loaded
(defparameter *afm-files-directories*
-  (list (merge-pathnames #P"afm/*.afm" *cl-pdf-base-directory*))
+  (list (merge-pathnames
+         (make-pathname
+          :directory '(:relative "afm")
+          :type "afm"
+          :name :wild)
+         *cl-pdf-base-directory*))
    "The directory containing the Adobe Font Metrics files for the 14  
predefined fonts")
;; define the :pdf-binary feature if your Lisp implementation accepts


-- 
Gary Warren King
metabang.com
http://www.metabang.com/