annotate lisp/msw-faces.el @ 371:cc15677e0335 r21-2b1

Import from CVS: tag r21-2b1
author cvs
date Mon, 13 Aug 2007 11:03:08 +0200
parents 19dcec799385
children 6240c7796c7a
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
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
29 ;; This file does the magic to parse mswindows font names, and make sure that the
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
30 ;; default and modeline attributes of new frames are specified enough.
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
31
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
32 ;;; ensure that the default face has some reasonable fallbacks if nothing
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
33 ;;; else is specified.
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
34 (defun mswindows-init-device-faces (device)
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
35 (set-face-font 'default
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
36 '((mswindows default) . "Courier New:Regular:10") 'global)
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
37 )
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
38
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
39
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
40 (defun mswindows-init-frame-faces (frame)
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
41 )
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 ;;; 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
45 ;;; helper function for the functions below.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
46 ;;; mswindows fonts look like:
294
4b85ae5eabfb Import from CVS: tag r21-0b45
cvs
parents: 290
diff changeset
47 ;;; fontname[:[weight][ style][:pointsize[:effects]]][:charset]
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
48 ;;; A minimal mswindows font spec looks like:
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
49 ;;; Courier New
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
50 ;;; A maximal mswindows font spec looks like:
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
51 ;;; Courier New:Bold Italic:10:underline strikeout:western
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
52 ;;; Missing parts of the font spec should be filled in with these values:
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
53 ;;; Courier New:Normal:10::western
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
54 (defun mswindows-font-canonicalize-name (font)
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
55 "Given a mswindows font or font specification, this returns its
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
56 specification in canonical form."
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
57 (if (or (font-instance-p font)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
58 (stringp font))
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
59 (let ((name (if (font-instance-p font)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
60 (font-instance-name font)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
61 font)))
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
62 (cond ((string-match
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
63 "^[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
64 name) name)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
65 ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+:[a-zA-Z ]*$"
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
66 name) (concat name ":western"))
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
67 ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+$" name)
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
68 (concat name "::western"))
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
69 ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*$" name)
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
70 (concat name ":10::western"))
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 265
diff changeset
71 ((string-match "^[a-zA-Z ]+$" name)
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
72 (concat name ":Normal:10::western"))
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
73 (t "Courier New:Normal:10::western")))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
74
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
75 (defun mswindows-make-font-bold (font &optional device)
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
76 "Given a mswindows font specification, this attempts to make a bold font.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
77 If it fails, it returns nil."
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
78 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
79 (let ((name (mswindows-font-canonicalize-name font))
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
80 (oldwidth (font-instance-width font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
81 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
82 (let ((newfont (make-font-instance
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
83 (concat (substring name 0 (match-beginning 1))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
84 "Bold" (substring name (match-end 1)))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
85 device t)))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
86 ; Hack! on mswindows, bold fonts (even monospaced) are often wider than the
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
87 ; equivalent non-bold font. Making the bold font one point smaller usually
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
88 ; 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
89 (if (font-instance-p newfont)
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
90 (if (> (font-instance-width newfont) oldwidth)
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
91 (mswindows-find-smaller-font newfont)
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
92 newfont))))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
93
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
94 (defun mswindows-make-font-unbold (font &optional device)
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
95 "Given a mswindows font specification, this attempts to make a non-bold font.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
96 If it fails, it returns nil."
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
97 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
98 (let ((name (mswindows-font-canonicalize-name font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
99 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
100 (make-font-instance (concat
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
101 (substring name 0 (match-beginning 1))
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
102 "Normal" (substring name (match-end 1)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
103 device t))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
104
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
105 (defun mswindows-make-font-italic (font &optional device)
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
106 "Given a mswindows font specification, this attempts to make an `italic'
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
107 font. If it fails, it returns nil."
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
108 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
109 (let ((name (mswindows-font-canonicalize-name font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
110 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
111 (make-font-instance (concat
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
112 (substring name 0 (match-beginning 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
113 "Italic" (substring name (match-end 1)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
114 device t))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
115
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
116 (defun mswindows-make-font-unitalic (font &optional device)
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
117 "Given a mswindows font specification, this attempts to make a non-italic
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
118 font. If it fails, it returns nil."
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
119 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
120 (let ((name (mswindows-font-canonicalize-name font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
121 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
122 (make-font-instance (concat
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
123 (substring name 0 (match-beginning 1))
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
124 "Normal" (substring name (match-end 1)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
125 device t))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
126
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
127 (defun mswindows-make-font-bold-italic (font &optional device)
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
128 "Given a mswindows font specification, this attempts to make a `bold-italic'
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
129 font. If it fails, it returns nil."
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
130 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
131 (let ((name (mswindows-font-canonicalize-name font))
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
132 (oldwidth (font-instance-width font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
133 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
134 (let ((newfont (make-font-instance
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
135 (concat (substring name 0 (match-beginning 1))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
136 "Bold Italic" (substring name (match-end 1)))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
137 device t)))
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
138 ; Hack! on mswindows, bold fonts (even monospaced) are often wider than the
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
139 ; equivalent non-bold font. Making the bold font one point smaller usually
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
140 ; 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
141 (if (font-instance-p newfont)
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
142 (if (> (font-instance-width newfont) oldwidth)
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 321
diff changeset
143 (mswindows-find-smaller-font newfont)
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
144 newfont))))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
145
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
146 (defun mswindows-find-smaller-font (font &optional device)
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
147 "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
148 Returns the font if it succeeds, nil otherwise."
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
149 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
150 (let (old-size (name (mswindows-font-canonicalize-name font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
151 (string-match "^[a-zA-Z ]+:[a-zA-Z ]*:\\([0-9]+\\):" name)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
152 (setq old-size (string-to-int
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
153 (substring name (match-beginning 1) (match-end 1))))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
154 (if (> old-size 0)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
155 (make-font-instance (concat
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
156 (substring name 0 (match-beginning 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
157 (int-to-string (- old-size 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
158 (substring name (match-end 1)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
159 device t)))))
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
160
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents:
diff changeset
161 (defun mswindows-find-larger-font (font &optional device)
221
6c0ae1f9357f Import from CVS: tag r20-4b9
cvs
parents: 215
diff changeset
162 "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
163 Returns the font if it succeeds, nil otherwise."
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
164 (if (font-instance-p font)
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
165 (let (old-size (name (mswindows-font-canonicalize-name font)))
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
166 (string-match "^[a-zA-Z ]+:[a-zA-Z ]*:\\([0-9]+\\):" name)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
167 (setq old-size (string-to-int
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
168 (substring name (match-beginning 1) (match-end 1))))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
169 (make-font-instance (concat
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
170 (substring name 0 (match-beginning 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
171 (int-to-string (+ old-size 1))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
172 (substring name (match-end 1)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
173 device t))))