Attachment #97659 for bug #148516

View | Details | Raw Unified | Return to bug 148516
Collapse All | Expand All

Lines 1-8 Link Here

(-)cl-pdf-118.orig/cl-pdf-parser.asd (-3 / +4 lines)
1	;;;; -- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 --	1	;;;; -- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 --
2		2
3	(in-package asdf)	3	(defpackage #:cl-pdf-parser-system (:use #:common-lisp #:asdf))
		4	(in-package #:cl-pdf-parser-system)
4		5
5	(defsystem :cl-pdf-parser	6	(defsystem #:cl-pdf-parser
6	:name "cl-pdf-parser"	7	:name "cl-pdf-parser"
7	:author "Marc Battyani <marc.battyani@fractalconcept.com>"	8	:author "Marc Battyani <marc.battyani@fractalconcept.com>"
8	:maintainer "Marc Battyani <marc.battyani@fractalconcept.com>"	9	:maintainer "Marc Battyani <marc.battyani@fractalconcept.com>"
Lines 10-13 Link Here
10	:long-description "PDF parser"	11	:long-description "PDF parser"
11	:components ((:file "pdf-parser" :depends-on ())	12	:components ((:file "pdf-parser" :depends-on ())
12	(:file "pdf-template" :depends-on ("pdf-parser")))	13	(:file "pdf-template" :depends-on ("pdf-parser")))
13	:depends-on (:cl-pdf))	14	:depends-on (#:cl-pdf))




;;; You can reach me at marc.battyani@fractalconcept.com or marc@battyani.net
;;; The homepage of cl-pdf is here: http://www.fractalconcept.com/asp/html/cl-pdf.html

(defpackage #:cl-pdf-system (:use #:common-lisp #:asdf))
(in-package #:cl-pdf-system)
;;;Choose the zlib implementation you want to use (only one!)
(pushnew :use-salza-zlib cl:*features*)
;(pushnew :use-uffi-zlib cl:*features*)
;(pushnew :use-abcl-zlib cl:*features*)
;(pushnew :use-no-zlib cl:*features*)

#-(or use-uffi-zlib use-salza-zlib use-abcl-zlib use-no-zlib)
(Error "You must choose which zlib version you want to use")

#-(or uffi (not use-uffi-zlib))
(ignore-errors
  (print "Trying to load UFFI:")
  (asdf:operate 'asdf:load-op :uffi)
  (pushnew :uffi cl:*features*)
  (print "UFFI loaded."))

(load (merge-pathnames "iterate/iterate.asd" *load-truename*))

#+use-salza-zlib
(load (merge-pathnames "salza/salza.asd" *load-truename*))

#+clisp (setf *warn-on-floating-point-contagion* nil)

(defsystem #:cl-pdf
  :name "cl-pdf"
  :author "Marc Battyani <marc.battyani@fractalconcept.com>"
  :version "2.0"
  :maintainer "Marc Battyani <marc.battyani@fractalconcept.com>"
  :licence "BSD like licence"
  :description "Common Lisp PDF Generation Library"
  :long-description "The cl-pdf package provides a stand-alone Common Lisp library to generate PDF files."
  :perform (load-op :after (op cl-pdf)
		    (pushnew :cl-pdf cl:*features*))
  :components ((:file "defpackage")
	       (:file "config" :depends-on ("defpackage"))
	       (:file "zlib" :depends-on ("defpackage"))
	       (:file "zlib" :depends-on ("defpackage" #+use-uffi-zlib "init"))
	       (:file "font-metrics"  :depends-on ("config"))
	       (:file "encodings"  :depends-on ("defpackage"))
	       (:file "t1-font" :depends-on ("font-metrics" "encodings"))

	       (:file "text" :depends-on ("pdf-base"))
	       (:file "bar-codes" :depends-on ("pdf-geom"))
	       (:file "chart" :depends-on ("text" "pdf-geom")))
  :depends-on (#:iterate #:salza))

Lines 32-38 Link Here

(-)cl-pdf-118.orig/config.lisp (-1 / +1 lines)
32	;; The afm-files-directories is only for the 14 predefined fonts.	32	;; The afm-files-directories is only for the 14 predefined fonts.
33	;; other fonts must have their afm files read only when they are loaded	33	;; other fonts must have their afm files read only when they are loaded
34	(defparameter afm-files-directories	34	(defparameter afm-files-directories
35	(list (merge-pathnames #P"afm/.afm" cl-pdf-base-directory*))	35	'(#p"/usr/share/fonts/afm/")
36	"The directory containing the Adobe Font Metrics files for the 14 predefined fonts")	36	"The directory containing the Adobe Font Metrics files for the 14 predefined fonts")
37		37
38	;; define the :pdf-binary feature if your Lisp implementation accepts	38	;; define the :pdf-binary feature if your Lisp implementation accepts

Lines 79-89 Link Here

(-)cl-pdf-118.orig/zlib.lisp (-2 lines)
79		79
80	;;; salza zlib	80	;;; salza zlib
81		81
82	#+use-salza-zlib
83	(defun load-zlib (&optional force)	82	(defun load-zlib (&optional force)
84	(setf compress-streams t))	83	(setf compress-streams t))
85		84
86	#+use-salza-zlib
87	(defun compress-string (string)	85	(defun compress-string (string)
88	(let* ((input (if (stringp string)	86	(let* ((input (if (stringp string)
89	(deflate::string-to-octets string 0 (length string))	87	(deflate::string-to-octets string 0 (length string))

Return to bug 148516

Lines 4-48 Link Here

(-)cl-pdf-118.orig/cl-pdf.asd (-29 / +5 lines)
4	;;; You can reach me at marc.battyani@fractalconcept.com or marc@battyani.net	4	;;; You can reach me at marc.battyani@fractalconcept.com or marc@battyani.net
5	;;; The homepage of cl-pdf is here: http://www.fractalconcept.com/asp/html/cl-pdf.html	5	;;; The homepage of cl-pdf is here: http://www.fractalconcept.com/asp/html/cl-pdf.html
6		6
7	(in-package asdf)	7	(defpackage #:cl-pdf-system (:use #:common-lisp #:asdf))
8		8	(in-package #:cl-pdf-system)
9	;;;Choose the zlib implementation you want to use (only one!)
10	(pushnew :use-salza-zlib cl:features)
11	;(pushnew :use-uffi-zlib cl:features)
12	;(pushnew :use-abcl-zlib cl:features)
13	;(pushnew :use-no-zlib cl:features)
14
15	#-(or use-uffi-zlib use-salza-zlib use-abcl-zlib use-no-zlib)
16	(Error "You must choose which zlib version you want to use")
17
18	#-(or uffi (not use-uffi-zlib))
19	(ignore-errors
20	(print "Trying to load UFFI:")
21	(asdf:operate 'asdf:load-op :uffi)
22	(pushnew :uffi cl:features)
23	(print "UFFI loaded."))
24
25	(load (merge-pathnames "iterate/iterate.asd" load-truename))
26
27	#+use-salza-zlib
28	(load (merge-pathnames "salza/salza.asd" load-truename))
29		9
30	#+clisp (setf warn-on-floating-point-contagion nil)	10	#+clisp (setf warn-on-floating-point-contagion nil)
31		11
32	(defsystem :cl-pdf	12	(defsystem #:cl-pdf
33	:name "cl-pdf"	13	:name "cl-pdf"
34	:author "Marc Battyani <marc.battyani@fractalconcept.com>"	14	:author "Marc Battyani <marc.battyani@fractalconcept.com>"
35	:version "2.0"
36	:maintainer "Marc Battyani <marc.battyani@fractalconcept.com>"	15	:maintainer "Marc Battyani <marc.battyani@fractalconcept.com>"
37	:licence "BSD like licence"	16	:licence "BSD like licence"
38	:description "Common Lisp PDF Generation Library"	17	:description "Common Lisp PDF Generation Library"
39	:long-description "The cl-pdf package provides a stand-alone Common Lisp library to generate PDF files."	18	:long-description "The cl-pdf package provides a stand-alone Common Lisp library to generate PDF files."
40	:perform (load-op :after (op cl-pdf)
41	(pushnew :cl-pdf cl:features))
42	:components ((:file "defpackage")	19	:components ((:file "defpackage")
43	(:file "config" :depends-on ("defpackage"))	20	(:file "config" :depends-on ("defpackage"))
44	#+use-uffi-zlib (:file "init" :depends-on ("config"))	21	(:file "zlib" :depends-on ("defpackage"))
45	(:file "zlib" :depends-on ("defpackage" #+use-uffi-zlib "init"))
46	(:file "font-metrics" :depends-on ("config"))	22	(:file "font-metrics" :depends-on ("config"))
47	(:file "encodings" :depends-on ("defpackage"))	23	(:file "encodings" :depends-on ("defpackage"))
48	(:file "t1-font" :depends-on ("font-metrics" "encodings"))	24	(:file "t1-font" :depends-on ("font-metrics" "encodings"))
Lines 56-59 Link Here
56	(:file "text" :depends-on ("pdf-base"))	32	(:file "text" :depends-on ("pdf-base"))
57	(:file "bar-codes" :depends-on ("pdf-geom"))	33	(:file "bar-codes" :depends-on ("pdf-geom"))
58	(:file "chart" :depends-on ("text" "pdf-geom")))	34	(:file "chart" :depends-on ("text" "pdf-geom")))
59	:depends-on (:iterate #+use-salza-zlib :salza))	35	:depends-on (#:iterate #:salza))