/[mcclim]/mcclim/medium.lisp
ViewVC logotype

Diff of /mcclim/medium.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.33 by adejneka, Tue May 28 07:59:14 2002 UTC revision 1.34 by adejneka, Mon Jun 3 02:15:05 2002 UTC
# Line 88  Line 88 
88  (defgeneric text-style-family (text-style))  (defgeneric text-style-family (text-style))
89  (defgeneric text-style-face (text-style))  (defgeneric text-style-face (text-style))
90  (defgeneric text-style-size (text-style))  (defgeneric text-style-size (text-style))
91  (defgeneric merge-text-style (text-style-1 text-style-2))  (defgeneric merge-text-styles (text-style-1 text-style-2))
92  (defgeneric text-style-ascent (text-style medium))  (defgeneric text-style-ascent (text-style medium))
93  (defgeneric text-style-descent (text-style medium))  (defgeneric text-style-descent (text-style medium))
94  (defgeneric text-style-height (text-style medium))  (defgeneric text-style-height (text-style medium))
# Line 199  Line 199 
199    
200  ;;; Text-style utilities  ;;; Text-style utilities
201    
202  (defun merge-text-styles (s1 s2)  (defmethod merge-text-styles (s1 s2)
203      (setq s1 (parse-text-style s1))
204      (setq s2 (parse-text-style s2))
205    (if (and (not (device-font-text-style-p s1))    (if (and (not (device-font-text-style-p s1))
206             (not (device-font-text-style-p s2)))             (not (device-font-text-style-p s2)))
207        (let ((new-style (make-text-style (or (text-style-family s1)        (let ((new-style (make-text-style (or (text-style-family s1)
# Line 209  Line 211 
211                                          (or (text-style-size s1)                                          (or (text-style-size s1)
212                                              (text-style-size s2)))))                                              (text-style-size s2)))))
213          (with-slots (size) new-style          (with-slots (size) new-style
214            (case size            (case (text-style-size s1)
215              (:smaller              (:smaller
216               (setq size (find-smaller-size (text-style-size s2))))               (setq size (find-smaller-size (text-style-size s2))))
217              (:larger              (:larger

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.34

  ViewVC Help
Powered by ViewVC 1.1.5