[mcclim-cvs] CVS mcclim

[ahefner]

Update of /project/mcclim/cvsroot/mcclim
In directory clnet:/tmp/cvs-serv5296

Modified Files:
	medium.lisp 
Log Message:
Added merge-line-styles function.


--- /project/mcclim/cvsroot/mcclim/medium.lisp	2006/12/24 14:27:43	1.61
+++ /project/mcclim/cvsroot/mcclim/medium.lisp	2007/02/05 02:57:58	1.62
@@ -499,6 +499,19 @@
        (eql (line-style-joint-shape style1) (line-style-joint-shape style2))
        (eql (line-style-cap-shape style1) (line-style-cap-shape style2))
        (eql (line-style-dashes style1) (line-style-dashes style2))))
+
+(defun merge-line-styles (a b)
+  (make-line-style :unit (or (line-style-unit a)
+                             (line-style-unit b))
+                   :thickness (or (line-style-thickness a)
+                                  (line-style-thickness b))
+                   :joint-shape (or (line-style-joint-shape a)
+                                    (line-style-joint-shape b))
+                   :cap-shape (or (line-style-cap-shape a)
+                                  (line-style-cap-shape b))
+                   :dashes (or (line-style-dashes a)
+                               (line-style-dashes b))))
+
 
 ;;; Misc ops