From ed6b832bc472168f1f54f04f39d1380140610c7c Mon Sep 17 00:00:00 2001 From: Dave Cooper Date: Thu, 28 Mar 2013 15:05:17 -0400 Subject: [PATCH 2/2] make it so you can load without afm directory --- defpackage.lisp | 2 +- zzinit.lisp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/defpackage.lisp b/defpackage.lisp index 7009672..276ca0e 100644 --- a/defpackage.lisp +++ b/defpackage.lisp @@ -49,4 +49,4 @@ #:load-t1-font #:load-ttu-font #:encoding #:get-encoding #:draw-bar-code128 #:*page-number* #:test-template #:make-template-from-page #:add-templates-to-page #:draw-template - #:image-file-parse-error #:initialize!)) + #:image-file-parse-error #:initialize! #:confirm-afm-files-directories)) diff --git a/zzinit.lisp b/zzinit.lisp index 6e6ca0c..153290d 100644 --- a/zzinit.lisp +++ b/zzinit.lisp @@ -12,9 +12,11 @@ (in-package #:pdf) (defun initialize! (&key afm-files-directories) -"Directory list. Set the afm-files-directories to the correct runtime value, and + "Directory list. Set the afm-files-directories to the correct runtime value, and force loading of the font data." (when afm-files-directories + (when (atom afm-files-directories) + (setq afm-files-directories (list afm-files-directories))) (setq *afm-files-directories* afm-files-directories)) (confirm-afm-files-directories) (load-fonts t) @@ -36,9 +38,10 @@ initialize the system with something like this: (pdf:initialize! :afm-files-directories (list \"/usr/share/fonts/afm/\")) " - (length nonexistent) nonexistent)))) - + (length nonexistent) nonexistent)) + (if (or nonexistent (null *afm-files-directories*)) nil t))) + (confirm-afm-files-directories) -- 1.8.1.3