summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog.fb30
-rw-r--r--lisp/cus-face.el1
-rw-r--r--lisp/faces.el11
3 files changed, 39 insertions, 3 deletions
diff --git a/lisp/ChangeLog.fb b/lisp/ChangeLog.fb
new file mode 100644
index 00000000000..ac548df61b9
--- /dev/null
+++ b/lisp/ChangeLog.fb
@@ -0,0 +1,30 @@
+2008-05-11 Kenichi Handa <handa@m17n.org>
+
+ * language/korean.el ("Korean"): Set `iso639-language'
+ property to `ko'.
+
+ * language/japanese.el ("Japanese"): Set `iso639-language'
+ property to `ja'.
+
+ * language/chinese.el ("Chinese-GB", "Chinese-BIG5")
+ ("Chinese-CNS", "Chinese-EUC-TW", "Chinese-GBK")
+ ("Chinese-GB18030"): Set `iso639-language' property to `zh'.
+
+ * international/mule-cmds.el (set-language-environment): Set
+ current-iso639-language
+
+ * international/fontset.el (setup-default-fontset): For kana, han,
+ hangul, and cjk-misc, move an entry with font-spec at the end.
+ (generate-fontset-menu): Exclue fontset-auto* from the list.
+
+ * composite.el (compose-chars-after): Assume that WINDOW is always
+ non-nil.
+
+ * faces.el (font-weight-table, font-slant-table)
+ (font-swidth-table): Declare them by defconst. Change the format
+ of elements. Call internal-set-font-style-table after their
+ declaration.
+ (face-valid-attribute-values): Call font-family-list. Get values
+ for width, weight, and slant from font-xxx-table.
+
+ * cus-face.el (custom-face-attributes): Add "thin" for :weight.
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index c5665990732..2c389c15397 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -86,6 +86,7 @@
(const :tag "ultracondensed" ultra-condensed)
(const :tag "ultraexpanded" ultra-expanded)
(const :tag "wide" extra-expanded)))
+
(:height
(choice :tag "Height"
:help-echo "Face's font height."
diff --git a/lisp/faces.el b/lisp/faces.el
index 556497a6a12..78d35895f9c 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -114,7 +114,10 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc."
(bold 200)
(extra-bold 205 extrabold)
(ultra-bold 210 ultrabold black))
- "Alist of font weight symbols vs the corresponding numeric values.")
+ "Alist of font weight symbols vs the corresponding numeric values.
+Each element has the form:
+ \(SYMBOLIC-VALUE NUMERIC-VALUE ALISE-SYMBOL ...)
+")
(defconst font-slant-table
'((reverse-oblique 0 ro)
@@ -122,7 +125,8 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc."
(normal 100 r)
(italic 200 i ot)
(oblique 210 o))
- "Alist of font slant symbols vs the corresponding numeric values.")
+ "Alist of font slant symbols vs the corresponding numeric values.
+See `font-weight-table' for the detailed format.")
(defconst font-width-table
'((ultra-condensed 50 ultracondensed)
@@ -134,7 +138,8 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc."
(expanded 125)
(extra-expanded 150 extraexpanded)
(ultra-expanded 200 ultraexpanded wide))
- "Alist of font width symbols vs the corresponding numeric values.")
+ "Alist of font width symbols vs the corresponding numeric values.
+See `font-weight-table' for the detailed format.")
(internal-set-font-style-table
font-weight-table font-slant-table font-width-table)