annotate lisp/msw-faces.el @ 294:4b85ae5eabfb r21-0b45

Import from CVS: tag r21-0b45
author cvs
date Mon, 13 Aug 2007 10:38:01 +0200
parents c9fe270a4101
children 70ad99077275
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
1 ;;; msw-faces.el --- mswindows-specific face stuff.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
2
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
3 ;;; Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
4 ;;; Copyright (C) 1995, 1996 Ben Wing.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
5
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
6 ;; Author: Jamie Zawinski
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
7 ;; Modified by: Chuck Thompson
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
8 ;; Modified by: Ben Wing
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
9 ;; Modified by: Martin Buchholz
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
10 ;; Rewritten for mswindows by: Jonathan Harris
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
11
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
12 ;; This file is part of XEmacs.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
13
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
14 ;; XEmacs is free software; you can redistribute it and/or modify it
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
15 ;; under the terms of the GNU General Public License as published by
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
16 ;; the Free Software Foundation; either version 2, or (at your option)
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
17 ;; any later version.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
18
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
19 ;; XEmacs is distributed in the hope that it will be useful, but
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
20 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
22 ;; General Public License for more details.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
23
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
24 ;; You should have received a copy of the GNU General Public License
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
25 ;; along with XEmacs; see the file COPYING. If not, write to the
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
26 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
27 ;; Boston, MA 02111-1307, USA.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
28
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
29 ;; This file does the magic to parse mswindows font names, and make sure that the
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
30 ;; default and modeline attributes of new frames are specified enough.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
31
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
32 ;;; ensure that the default face has some reasonable fallbacks if nothing
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
33 ;;; else is specified.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
34 (defun mswindows-init-device-faces (device)
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 282
diff changeset
35 (set-face-font 'default
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 282
diff changeset
36 '((mswindows default) . "Courier New:Regular:10") 'global)
290
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
37 ;; gui elements
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
38 (set-face-foreground 'gui-element '((mswindows default) . "Black") 'global)
c9fe270a4101 Import from CVS: tag r21-0b43
cvs
parents: 288
diff changeset
39 (set-face-background 'gui-element '((mswindows default) . "Gray75") 'global)
288
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 282
diff changeset
40 (set-face-foreground 'default '((mswindows default) . "black") 'global)
e11d67e05968 Import from CVS: tag r21-0b42
cvs
parents: 282
diff changeset
41 (set-face-background 'default '((mswindows default) . "white") 'global)
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
42 )
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
43
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
44
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
45 (defun mswindows-init-frame-faces (frame)
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
46 )
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
47
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
48
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
49 ;;; Fill in missing parts of a font spec. This is primarily intended as a
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
50 ;;; helper function for the functions below.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
51 ;;; mswindows fonts look like:
294
4b85ae5eabfb Import from CVS: tag r21-0b45
cvs
parents: 290
diff changeset
52 ;;; fontname[:[weight][ style][:pointsize[:effects]]][:charset]
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
53 ;;; A minimal mswindows font spec looks like:
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
54 ;;; Courier New
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
55 ;;; A maximal mswindows font spec looks like:
294
4b85ae5eabfb Import from CVS: tag r21-0b45
cvs
parents: 290
diff changeset
56 ;;; Courier New:Bold Italic:10:underline strikeout:western
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
57 ;;; Missing parts of the font spec should be filled in with these values:
294
4b85ae5eabfb Import from CVS: tag r21-0b45
cvs
parents: 290
diff changeset
58 ;;; Courier New:Normal:10::western
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
59 (defun mswindows-font-canonicalize-name (font)
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
60 "Given a mswindows font or font specification, this returns its
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
61 specification in canonical form."
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
62 (if (or (font-instance-p font)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
63 (stringp font))
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
64 (let ((name (if (font-instance-p font)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
65 (font-instance-name font)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
66 font)))
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
67 (cond ((string-match
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
68 "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+:[a-zA-Z ]*:[a-zA-Z 0-9]*$"
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
69 name) name)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
70 ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+:[a-zA-Z ]*$"
294
4b85ae5eabfb Import from CVS: tag r21-0b45
cvs
parents: 290
diff changeset
71 name) (concat name ":western"))
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
72 ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+$" name)
294
4b85ae5eabfb Import from CVS: tag r21-0b45
cvs
parents: 290
diff changeset
73 (concat name "::western"))
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
74 ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*$" name)
294
4b85ae5eabfb Import from CVS: tag r21-0b45
cvs
parents: 290
diff changeset
75 (concat name ":10::western"))
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
76 ((string-match "^[a-zA-Z ]+$" name)
294
4b85ae5eabfb Import from CVS: tag r21-0b45
cvs
parents: 290
diff changeset
77 (concat name ":Normal:10::western"))
4b85ae5eabfb Import from CVS: tag r21-0b45
cvs
parents: 290
diff changeset
78 (t "Courier New:Normal:10::western")))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
79
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
80 (defun mswindows-make-font-bold (font &optional device)
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
81 "Given a mswindows font specification, this attempts to make a bold font.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
82 If it fails, it returns nil."
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
83 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
84 (let ((name (mswindows-font-canonicalize-name font))
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
85 (oldwidth (font-instance-width font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
86 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
87 (let ((newfont (make-font-instance
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
88 (concat (substring name 0 (match-beginning 1))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
89 "Bold" (substring name (match-end 1)))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
90 device t)))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
91 ; Hack! on mswindows, bold fonts (even monospaced) are often wider than the
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
92 ; equivalent non-bold font. Making the bold font one point smaller usually
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
93 ; makes it the same width (maybe at the expense of making it one pixel shorter)
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
94 (if (font-instance-p newfont)
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
95 (if (> (font-instance-width newfont) oldwidth)
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
96 (mswindows-find-smaller-font newfont)
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
97 newfont))))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
98
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
99 (defun mswindows-make-font-unbold (font &optional device)
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
100 "Given a mswindows font specification, this attempts to make a non-bold font.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
101 If it fails, it returns nil."
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
102 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
103 (let ((name (mswindows-font-canonicalize-name font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
104 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
105 (make-font-instance (concat
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
106 (substring name 0 (match-beginning 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
107 "Normal" (substring name (match-end 1)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
108 device t))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
109
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
110 (defun mswindows-make-font-italic (font &optional device)
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
111 "Given a mswindows font specification, this attempts to make an `italic'
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
112 font. If it fails, it returns nil."
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
113 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
114 (let ((name (mswindows-font-canonicalize-name font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
115 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
116 (make-font-instance (concat
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
117 (substring name 0 (match-beginning 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
118 "Italic" (substring name (match-end 1)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
119 device t))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
120
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
121 (defun mswindows-make-font-unitalic (font &optional device)
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
122 "Given a mswindows font specification, this attempts to make a non-italic
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
123 font. If it fails, it returns nil."
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
124 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
125 (let ((name (mswindows-font-canonicalize-name font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
126 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
127 (make-font-instance (concat
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
128 (substring name 0 (match-beginning 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
129 "Normal" (substring name (match-end 1)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
130 device t))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
131
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
132 (defun mswindows-make-font-bold-italic (font &optional device)
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
133 "Given a mswindows font specification, this attempts to make a `bold-italic'
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
134 font. If it fails, it returns nil."
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
135 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
136 (let ((name (mswindows-font-canonicalize-name font))
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
137 (oldwidth (font-instance-width font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
138 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
139 (let ((newfont (make-font-instance
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
140 (concat (substring name 0 (match-beginning 1))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
141 "Bold Italic" (substring name (match-end 1)))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
142 device t)))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
143 ; Hack! on mswindows, bold fonts (even monospaced) are often wider than the
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
144 ; equivalent non-bold font. Making the bold font one point smaller usually
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
145 ; makes it the same width (maybe at the expense of making it one pixel shorter)
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
146 (if (font-instance-p newfont)
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
147 (if (> (font-instance-width newfont) oldwidth)
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
148 (mswindows-find-smaller-font newfont)
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
149 newfont))))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
150
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
151 (defun mswindows-find-smaller-font (font &optional device)
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
152 "Loads a new version of the given font (or font name) 1 point smaller.
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
153 Returns the font if it succeeds, nil otherwise."
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
154 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
155 (let (old-size (name (mswindows-font-canonicalize-name font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
156 (string-match "^[a-zA-Z ]+:[a-zA-Z ]*:\\([0-9]+\\):" name)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
157 (setq old-size (string-to-int
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
158 (substring name (match-beginning 1) (match-end 1))))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
159 (if (> old-size 0)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
160 (make-font-instance (concat
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
161 (substring name 0 (match-beginning 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
162 (int-to-string (- old-size 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
163 (substring name (match-end 1)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
164 device t)))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
165
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
166 (defun mswindows-find-larger-font (font &optional device)
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
167 "Loads a new version of the given font (or font name) 1 point larger.
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
168 Returns the font if it succeeds, nil otherwise."
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
169 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
170 (let (old-size (name (mswindows-font-canonicalize-name font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
171 (string-match "^[a-zA-Z ]+:[a-zA-Z ]*:\\([0-9]+\\):" name)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
172 (setq old-size (string-to-int
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
173 (substring name (match-beginning 1) (match-end 1))))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
174 (make-font-instance (concat
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
175 (substring name 0 (match-beginning 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
176 (int-to-string (+ old-size 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
177 (substring name (match-end 1)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
178 device t))))