Changeset 3052

Timestamp:

03/09/03 07:31:18 (6 years ago)

Author:

himi

Message:

(mw32-windows-font-charset-database):
Don't init. it here. It was removed.
(w32-default-logfont): Removed. It is obsolete.
(w32-automatic-font-regist, w32-generate-tribial-logfont-list): Ditto.
(w32-regist-initial-font, w32-automatic-fontset-regist
(w32-auto-regist-bdf-font): Now it takes <encoding> not <encoding-type> nor
<encoder> as the third argument.

Files:

• work/cvs2svn/lisp/international/mw32misc.el (modified) (3 diffs)

work/cvs2svn/lisp/international/mw32misc.el

@@ -277 +277 @@
-
-; JOHAB_CHARSET
-
-(let ((slot mw32-charset-windows-font-info-alist)
-      elem cnum enc)
-  (while (setq elem (car slot))
-    (setq cnum (nth 1 elem)
-          enc (nth 2 elem)
-          slot (cdr slot))
-    (aset mw32-windows-font-charset-database cnum enc)))
-
-
-;;;
@@ -417 +408 @@
-;;;
-
-;;;
-;;; Obsolete codes.
-;;;
-
-(defvar w32-default-logfont '(w32-logfont "FixedSys" 0 0 400 0 nil nil nil 0 1 1 1)
-  "Default font is generated from this.")
-
-(defun w32-automatic-font-regist (name lflist &optional encoding-type)
-  (w32-add-font name '((width . 0)
-                       (height . 0)
-                       (base . 0)
-                       (overhang . 0)
-                       (encoding-type . 0)))
-  (let (lf metric num encoder
-           (i  0)
-           (width 0) 
-           (height 0)
-           (base 0) 
-           (overhang 0))
-    (if (not (numberp encoding-type))
-        (progn
-          (setq encoder encoding-type)
-          (setq encoding-type 0)))
-    (while (setq lf (car lflist))
-      (setq metric (w32-get-logfont-info lf)
-            num (cdr (assq 'width metric)))
-      (if (> num width) (setq width num))
-      (setq num (cdr (assq 'height metric)))
-      (if (> num height) (setq height num))
-      (setq num (cdr (assq 'base metric)))
-      (if (> num base) (setq base num))
-      (setq num (cdr (assq 'overhang metric)))
-      (if (> num overhang) (setq overhang num))
-      (w32-change-font-logfont name i lf)
-      (setq lflist (cdr lflist))
-      (setq i (1+ i)))
-    (w32-change-font-attribute
-     name
-     (list (cons 'width width)
-           (cons 'height height)
-           (cons 'base base)
-           (cons 'overhang overhang)
-           (cons 'encoding-type encoding-type)
-           (cons 'encoder encoder)))))
-
-(defun w32-generate-tribial-logfont-list (logfont)
-  (let* ((bold-font (w32-change-logfont-weight logfont 300))
-         (italic-font (w32-change-logfont-italic-p logfont t))
-         (italic-bold-font (w32-change-logfont-italic-p bold-font t)))
-    (list logfont bold-font italic-font italic-bold-font)))
-
-(defun w32-regist-initial-font ()
-  (w32-automatic-font-regist
-   "initial" 
-   (w32-generate-tribial-logfont-list w32-default-logfont) 0))
-
-(defun w32-automatic-fontset-regist (name orgfont)
-  (let ((encoding-alist mw32-charset-windows-font-info-alist)
-        x ret)
-    (while encoding-alist
-      (setq x (car encoding-alist))
-      (setq encoding-alist (cdr encoding-alist))
-      (let* ((charset (car x))
-             (ms-charset (car (cdr x)))
-             (encoding-type (car (cdr (cdr x))))
-             (font-name (format "%s-%s" orgfont (symbol-name charset)))
-             orglf newlf metric)
-        (setq orglf
-              (w32-change-logfont-charset
-               (cond
-                ((w32-get-font-logfont orgfont 0))
-                (t
-                 w32-default-logfont)) ms-charset))
-        (setq metric (w32-get-logfont-info orglf))
-        (if (or (= ms-charset (cdr (assq 'charset-num metric)))
-                ;;; This is very dirty hack.
-                ;;  Some Windows(TM) localized editions
-                ;; (at least Windows98 Thai edition) have
-                ;; a bogus font mapper, which may maps a logfont
-                ;; to a font of wrong charset number
-                ;; if any other keys of the logfont are not match.
-                ;; This must be a bug of Windows.  Nevertheless,
-                ;; we should make ASCII font to display, thus,
-                ;; we force to set the logfont (that is
-                ;; seemed to be to invalid) to ASCII font of
-                ;; the fontset that will be created.
-                (eq charset 'ascii))
-            (progn
-              (w32-automatic-font-regist
-               font-name
-               (mapcar
-                (lambda (x)
-                  (setq metric (w32-get-logfont-info orglf)
-                        newlf (w32-change-logfont-width
-                               orglf
-                               (cdr (assq 'width metric)))
-                        newlf (w32-change-logfont-height
-                               newlf
-                               (cdr (assq 'height metric))))
-                  newlf)
-               '(0 1 2 3))
-               encoding-type)
-              (setq ret (cons (cons charset font-name) ret))))))
-      (new-fontset name ret)))
-  
-;(new-fontset "default-fontset" '((ascii . "default")
-;                                (japanese-jisx0208 . "default")
-;                                (katakana-jisx0201 . "default")))
-;
-;(set-default-font "default-fontset")
-
-;;;;;
-;;;;;
@@ -539 +419 @@
-    (if bdfatt
-        (progn
-
-
-
-
-
-
-
-
+
+
+
-          (w32-add-font fontname bdfatt)
-          (w32-change-font-logfont fontname 0