Mercurial > hg > xemacs-beta
annotate lisp/mule/mule-msw-init-late.el @ 5015:d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* faces.c:
* faces.c (face_property_matching_instance):
* faces.c (ensure_face_cachel_contains_charset):
* faces.h (FACE_FONT):
* lisp.h:
* lisp.h (enum font_specifier_matchspec_stages):
* objects-msw.c:
* objects-msw.c (mswindows_font_spec_matches_charset):
* objects-msw.c (mswindows_find_charset_font):
* objects-tty.c:
* objects-tty.c (tty_font_spec_matches_charset):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c:
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* objects.c:
* objects.c (font_instantiate):
* objects.c (FROB):
* specifier.c:
* specifier.c (charset_matches_specifier_tag_set_p):
* specifier.c (call_charset_predicate):
* specifier.c (define_specifier_tag):
* specifier.c (Fdefine_specifier_tag):
* specifier.c (setup_charset_initial_specifier_tags):
* specifier.c (specifier_instance_from_inst_list):
* specifier.c (FROB):
* specifier.c (vars_of_specifier):
* specifier.h:
Rename the specifier-font-matching stages in preparation for
eliminating shadowed warnings, some other related fixes from
ben-unicode-internal.
1. Rename raw enums:
initial -> STAGE_INITIAL
final -> STAGE_FINAL
impossible -> NUM_MATCHSPEC_STAGES
2. Move `enum font_specifier_matchspec_stages' from
specifier.h to lisp.h.
3. Whitespace changes to match coding standards.
4. Eliminate unused second argument STAGE in charset predicates
that don't use it -- the code that calls the charset predicates
is now smart enough to supply the right number of arguments
automatically.
5. Add some long(ish) comments and authorial notices, esp. in
objects.c.
6. In specifier.c, change Vcharset_tag_lists from a vector over
leading bytes to a hash table over charsets. This change is
unnecessary currently but doesn't hurt and will be required
when we merge in Unicode-internal.
7. In specifier.c, extract out the code that calls charset predicates
into a function call_charset_predicate().
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 08 Feb 2010 16:51:25 -0600 |
| parents | 980575c76541 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 780 | 1 ;;; mule-msw-init-late.el --- initialization code for MS Windows under MULE |
| 2 ;;; Copyright (C) 2001, 2002 Ben Wing. | |
| 3 | |
| 4 ;; This file is part of XEmacs. | |
| 5 | |
| 6 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 7 ;; under the terms of the GNU General Public License as published by | |
| 8 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 9 ;; any later version. | |
| 10 | |
| 11 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 12 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 14 ;; General Public License for more details. | |
| 15 | |
| 16 ;; You should have received a copy of the GNU General Public License | |
| 17 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 18 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 ;; Boston, MA 02111-1307, USA. | |
| 20 | |
| 21 ;; mapping between XEmacs charsets and code pages. something like this | |
| 22 ;; will might around once all the Unicode code is written, so we know how | |
| 23 ;; to choose the right font. (perhaps "code pages" will become "Unicode | |
| 24 ;; subranges"; they're more or less equivalent under Windows from a font | |
| 25 ;; perspective.) But ... in reality, we can just query the charset for its | |
| 26 ;; Unicode ranges, and the "charset ID" is not a good indicator of what a | |
| 27 ;; particular font supports; e.g. there's no charset ID at all for Indian | |
| 28 ;; fonts, but Windows clearly supports them. (The docs say that Indian | |
| 29 ;; support is "all Unicode"; i.e. charset ID's are on their way out. I | |
| 30 ;; guess we're supposed to query the font for what ranges it supports, and | |
| 31 ;; what its preferred range is.) | |
| 32 | |
| 872 | 33 (let ((l '((ascii . "Western") |
| 34 (latin-iso8859-2 . "Central European") | |
| 35 (cyrillic-iso8859-5 . "Cyrillic") | |
| 36 (latin-iso8859-1 . "Western") | |
| 37 (greek-iso8859-7 . "Greek") | |
| 38 (latin-iso8859-9 . "Turkish") | |
| 39 (hebrew-iso8859-8 . "Hebrew") | |
|
4805
980575c76541
Move the arabic-iso8859-6 character set back to C, otherwise X11 lookup fails.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4491
diff
changeset
|
40 (arabic-iso8859-6 . "Arabic") |
| 872 | 41 (latin-iso8859-4 . "Baltic") |
| 42 (vietnamese-viscii-lower . "Viet Nam") | |
| 43 (vietnamese-viscii-upper . "Viet Nam") | |
| 44 (thai-tis620 . "Thai") | |
| 45 (latin-jisx0201 . "Japanese") | |
| 46 (katakana-jisx0201 . "Japanese") | |
| 47 ;; (japanese-jisx0208-1978 . "Japanese") | |
| 48 (japanese-jisx0208 . "Japanese") | |
| 49 (japanese-jisx0212 . "Japanese") | |
| 50 (chinese-gb2312 . "Simplified Chinese") | |
| 51 (korean-ksc5601 . "Korean") | |
| 52 (chinese-big5-1 . "Traditional Chinese") | |
| 53 (chinese-big5-2 . "Traditional Chinese")))) | |
| 54 (while l | |
| 55 (let ((charset (car (car l))) | |
| 56 (registry (cdr (car l)))) | |
| 4103 | 57 (declare-fboundp (mswindows-set-charset-registry charset registry)) |
| 872 | 58 (setq l (cdr l))))) |
| 59 | |
| 780 | 60 (let ((l '((ascii . 1252) |
| 61 (latin-iso8859-2 . 1250) | |
| 62 (cyrillic-iso8859-5 . 1251) | |
| 63 (latin-iso8859-1 . 1252) | |
| 64 (greek-iso8859-7 . 1253) | |
| 65 (latin-iso8859-9 . 1254) | |
| 66 (hebrew-iso8859-8 . 1255) | |
| 67 ;; (arabic-iso8859-6 . 1256) | |
| 68 (latin-iso8859-4 . 1257) | |
| 69 (vietnamese-viscii-lower . 1258) | |
| 70 (vietnamese-viscii-upper . 1258) | |
| 71 ;; (thai-tis620 . 874) | |
| 72 (latin-jisx0201 . 932) | |
| 73 (katakana-jisx0201 . 932) | |
| 74 ;; (japanese-jisx0208-1978 . 932) | |
| 75 (japanese-jisx0208 . 932) | |
| 76 (japanese-jisx0212 . 932) | |
| 77 (chinese-gb2312 . 936) | |
| 78 (korean-ksc5601 . 949) | |
| 79 (chinese-big5-1 . 950) | |
| 80 (chinese-big5-2 . 950)))) | |
| 81 (while l | |
| 82 (let ((charset (car (car l))) | |
| 83 (code-page (cdr (car l)))) | |
| 4103 | 84 (declare-fboundp (mswindows-set-charset-code-page charset code-page)) |
| 780 | 85 (setq l (cdr l))))) |