aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2008-05-22 02:34:30 +0000
committerKenichi Handa2008-05-22 02:34:30 +0000
commit4cd217dc0db45f2305d19e0ab7801d7aead73cd7 (patch)
tree0937f439a08b0305481137f055af3f79bbed5c75
parent318548bef00c4228063e46c2e310fc8660abd84d (diff)
downloademacs-4cd217dc0db45f2305d19e0ab7801d7aead73cd7.tar.gz
emacs-4cd217dc0db45f2305d19e0ab7801d7aead73cd7.zip
(font-weight-table, font-slant-table)
(font-width-table): Delete them. Don't call internal-set-font-style-table.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/faces.el41
2 files changed, 4 insertions, 41 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 40fd69bd08e..00e503e2ad4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12008-05-22 Kenichi Handa <handa@m17n.org> 12008-05-22 Kenichi Handa <handa@m17n.org>
2 2
3 * faces.el (font-weight-table, font-slant-table)
4 (font-width-table): Delete them. Don't call
5 internal-set-font-style-table.
6
3 * international/mule-diag.el (font-show-log): New function. 7 * international/mule-diag.el (font-show-log): New function.
4 8
5 * international/fontset.el (script-representative-chars): Add more 9 * international/fontset.el (script-representative-chars): Add more
diff --git a/lisp/faces.el b/lisp/faces.el
index 0da556befc8..5537fbef6c3 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -100,47 +100,6 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc."
100 (set-default symbol value) 100 (set-default symbol value)
101 (internal-set-alternative-font-registry-alist value))) 101 (internal-set-alternative-font-registry-alist value)))
102 102
103
104(defconst font-weight-table
105 '((thin 0)
106 (ultra-light 20 ultralight)
107 (extra-light 40 extralight)
108 (light 50)
109 (semi-light 75 semilight demilight book)
110 (normal 100 medium regular)
111 (semi-bold 180 semibold demibold demi)
112 (bold 200)
113 (extra-bold 205 extrabold)
114 (ultra-bold 210 ultrabold black))
115 "Alist of font weight symbols vs the corresponding numeric values.
116Each element has the form:
117 \(SYMBOLIC-VALUE NUMERIC-VALUE ALIAS-SYMBOL ...)
118")
119
120(defconst font-slant-table
121 '((reverse-oblique 0 ro)
122 (reverse-italic 10 ri)
123 (normal 100 r)
124 (italic 200 i ot)
125 (oblique 210 o))
126 "Alist of font slant symbols vs the corresponding numeric values.
127See `font-weight-table' for the detailed format.")
128
129(defconst font-width-table
130 '((ultra-condensed 50 ultracondensed)
131 (extra-condensed 63 extracondensed)
132 (condensed 75 compressed narrow)
133 (semi-condensed 87 semicondensed semicondensed)
134 (normal 100 medium regular)
135 (semi-expanded 113 semiexpanded demiexpanded)
136 (expanded 125)
137 (extra-expanded 150 extraexpanded)
138 (ultra-expanded 200 ultraexpanded wide))
139 "Alist of font width symbols vs the corresponding numeric values.
140See `font-weight-table' for the detailed format.")
141
142(internal-set-font-style-table
143 font-weight-table font-slant-table font-width-table)
144 103
145;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 104;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
146;;; Creation, copying. 105;;; Creation, copying.