Changeset 3049

Timestamp:

03/08/03 23:13:15 (6 years ago)

Author:

miyoshi

Message:

(mw32-convert-font-request-attribute):
Check values of font option.

Files:

• work/cvs2svn/lisp/ChangeLog.Meadow (modified) (1 diff)
• work/cvs2svn/lisp/international/mw32misc.el (modified) (1 diff)

work/cvs2svn/lisp/ChangeLog.Meadow

@@ +1 @@
+2003-03-08  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+        * international/mw32misc.el (mw32-convert-font-request-attribute):
+        Check values of font option.
+
-2003-03-08  MIYASHITA Hisashi  <himi@meadowy.org>
-

work/cvs2svn/lisp/international/mw32misc.el

@@ -365 +365 @@
-          (aset vec 3 "\\*"))
-      ;; check option list is assq safe.
-unless (eq nil (cdr (last (car options)
+when (cdr (last (car options
-        (error "Option must be alist :%S" (car options)))
+      (let (elem value)
+        ;; check `spacing'
+        (setq elem (assoc 'spacing (car options)))
+        (when elem
+          (unless (numberp (cdr elem))
+            (error "Invalid value for spacing :%S" elem)))
+
+        ;; needless to check `centering'
+
+        ;; check `relative-compose'
+        (setq elem (assoc 'relative-compose (car options)))
+        (when elem
+          (unless (numberp (cdr elem))
+            (error "Invalid value for relative-compose :%S" elem)))
+
+        ;; check `default-ascent'
+        (setq elem (assoc 'default-ascent (car options)))
+        (when elem
+          (unless (numberp (cdr elem))
+            (error "Invalid value for default-ascent :%S" elem)))
+
+        ;; check `encoding'
+        (let ((valid-key '(nil 1-byte-set-msb 2-byte-set-msb
+                               shift_jis unicode)))
+          (setq elem (assoc 'encoding  (car options)))
+          (when elem
+            (setq value (cdr elem))
+            (unless (memq value valid-key)
+              (when (or (null (symbolp value))
+                        (null (get value 'ccl-program)))
+                (error "Invalid value for encoding :%S" elem))))))
+
-      (setq rs (cons (cons vec (cons llf options)) rs))
-      (setq ss (cdr ss)))