Mercurial > hg > xemacs-beta
annotate lisp/msw-faces.el @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 668c73e222fd |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; msw-faces.el --- mswindows-specific face stuff. |
| 2 | |
| 3 ;;; Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. | |
| 793 | 4 ;;; Copyright (C) 1995, 1996, 2002 Ben Wing. |
| 428 | 5 |
| 6 ;; Author: Jamie Zawinski | |
| 7 ;; Modified by: Chuck Thompson | |
| 8 ;; Modified by: Ben Wing | |
| 9 ;; Modified by: Martin Buchholz | |
| 10 ;; Rewritten for mswindows by: Jonathan Harris | |
| 11 | |
| 12 ;; This file is part of XEmacs. | |
| 13 | |
| 14 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 15 ;; under the terms of the GNU General Public License as published by | |
| 16 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 17 ;; any later version. | |
| 18 | |
| 19 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 20 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 22 ;; General Public License for more details. | |
| 23 | |
| 24 ;; You should have received a copy of the GNU General Public License | |
| 25 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 26 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 27 ;; Boston, MA 02111-1307, USA. | |
| 28 | |
| 29 ;; This file does the magic to parse mswindows font names, and make sure that | |
| 30 ;; the default and modeline attributes of new frames are specified enough. | |
| 31 | |
| 1346 | 32 (globally-declare-boundp |
| 33 '(mswindows-font-regexp mswindows-font-regexp-missing-1 | |
| 34 mswindows-font-regexp-missing-2 mswindows-font-regexp-missing-3 | |
| 35 mswindows-font-regexp-missing-4)) | |
| 36 | |
| 853 | 37 (defun mswindows-init-global-faces () |
| 38 (set-face-font 'gui-element "MS Sans Serif:Regular:8" nil 'mswindows)) | |
| 793 | 39 |
| 428 | 40 (defun mswindows-init-device-faces (device) |
| 442 | 41 (let ((color-default (device-system-metric device 'color-default)) |
| 42 (color-3d-face (device-system-metric device 'color-3d-face))) | |
| 43 ; Force creation of the default face font so that if it fails we get | |
| 44 ; an error now instead of a crash at frame creation. | |
| 45 (unless (face-font-instance 'default device) | |
| 46 (error "Can't find a suitable default font")) | |
| 872 | 47 |
| 48 ;; Don't set them on the device because then the global setting won't | |
| 49 ;; override them. | |
| 50 ;; #### Use device tags if we have multiple msprinter devices. (can we?) | |
| 442 | 51 (if (car color-default) |
| 872 | 52 (set-face-foreground 'default (car color-default) nil |
| 53 (device-type device))) | |
| 442 | 54 (if (cdr color-default) |
| 872 | 55 (set-face-background 'default (cdr color-default) nil |
| 56 (device-type device))) | |
| 442 | 57 (if (car color-3d-face) |
| 872 | 58 (set-face-foreground 'gui-element (car color-3d-face) nil |
| 59 (device-type device))) | |
| 442 | 60 (if (cdr color-3d-face) |
| 872 | 61 (set-face-background 'gui-element (cdr color-3d-face) nil |
| 62 (device-type device))) | |
| 793 | 63 )) |
| 428 | 64 |
| 65 (defun mswindows-init-frame-faces (frame) | |
| 66 ) | |
| 67 | |
| 68 ;; Other functions expect these regexps | |
| 872 | 69 (let |
| 70 ((- ":") | |
| 4022 | 71 ;; What happens if a font family contains a colon? I can't find any |
| 72 ;; documentation on that, and don't have a font editor to hand to test. | |
| 73 (fontname "\\([^:]*\\)") ; 1 | |
| 872 | 74 (style "\\(\\(?:[a-zA-Z]+\\(?: +[a-zA-Z]+\\)*\\)?\\)") ; 2 |
| 75 (pointsize "\\([0-9]*\\)") ; 3 | |
| 76 (effects "\\(\\(?:[a-zA-Z]+\\(?: +[a-zA-Z]+\\)*\\)?\\)") ; 4 | |
| 77 ;; must match "OEM/DOS" | |
| 78 (charset "\\([a-zA-Z/ ]*\\)") ; 5 | |
| 79 ) | |
| 80 (defconst mswindows-font-regexp | |
| 81 (concat "^" fontname - style - pointsize - effects - charset "$")) | |
| 82 (defconst mswindows-font-regexp-missing-1 | |
| 83 (concat "^" fontname - style - pointsize - effects "$")) | |
| 84 (defconst mswindows-font-regexp-missing-2 | |
| 85 (concat "^" fontname - style - pointsize "$")) | |
| 86 (defconst mswindows-font-regexp-missing-3 | |
| 87 (concat "^" fontname - style "$")) | |
| 88 (defconst mswindows-font-regexp-missing-4 | |
| 89 (concat "^" fontname "$")) | |
| 90 ) | |
| 428 | 91 |
| 92 ;;; Fill in missing parts of a font spec. This is primarily intended as a | |
| 93 ;;; helper function for the functions below. | |
| 94 ;;; mswindows fonts look like: | |
| 872 | 95 ;;; fontname[:[weight][ slant][:pointsize[:effects]]][:charset] |
| 428 | 96 ;;; A minimal mswindows font spec looks like: |
| 97 ;;; Courier New | |
| 98 ;;; A maximal mswindows font spec looks like: | |
| 99 ;;; Courier New:Bold Italic:10:underline strikeout:Western | |
| 872 | 100 (defun mswindows-canonicalize-font-name (font) |
| 101 "Given a mswindows font or font name, return its name in canonical form. | |
| 102 This adds missing colons and fills in the style field with \"Regular\". | |
| 103 This does *NOT* fill in the point size or charset fields, because in those | |
| 104 cases an empty field is not equivalent to any particular field value, but a | |
| 105 wildcard allowing for any possible value (charset Western and point size 10 | |
| 106 are chosen first, if they exist)." | |
| 107 (if (font-instance-p font) (setq font (font-instance-name font))) | |
| 108 ;; fill in missing colons | |
| 109 (setq font | |
| 110 (cond ((string-match mswindows-font-regexp font) font) | |
| 111 ((string-match mswindows-font-regexp-missing-1 font) | |
| 112 (concat font ":")) | |
| 113 ((string-match mswindows-font-regexp-missing-2 font) | |
| 114 (concat font "::")) | |
| 115 ((string-match mswindows-font-regexp-missing-3 font) | |
| 116 (concat font ":::")) | |
| 117 ((string-match mswindows-font-regexp-missing-4 font) | |
| 118 (concat font "::::")) | |
| 119 (t "::::"))) | |
| 120 (or (string-match mswindows-font-regexp font) (error "can't parse %S" font)) | |
| 121 (if (equal "" (match-string 2 font)) | |
| 122 (concat (substring font 0 (match-beginning 2)) "Regular" | |
| 123 (substring font (match-beginning 2))) | |
| 124 font)) | |
| 125 | |
| 126 (defun mswindows-parse-font-style (style) | |
| 127 ;; Parse a style into a cons (WEIGHT . SLANT). WEIGHT will never be the | |
| 128 ;; empty string (it may be "Regular"), but SLANT will be empty for | |
| 129 ;; non-italic. | |
| 130 (save-match-data | |
| 131 (let ((case-fold-search t)) | |
| 132 (cond ((equalp style "Italic") '("Regular" . "Italic")) | |
| 133 ((string-match "^\\([a-zA-Z ]+?\\) +Italic$" style) | |
| 134 (cons (match-string 1 style) "Italic")) | |
| 135 (t (cons style "")))))) | |
| 136 | |
| 137 (defun mswindows-construct-font-style (weight slant) | |
| 138 ;; Construct the style from WEIGHT and SLANT. Opposite of | |
| 139 ;; mswindows-parse-font-style. | |
| 140 (cond ((and (equal slant "") (equal weight "")) "Regular") | |
| 141 ((equal slant "") weight) | |
| 142 ((or (equalp weight "Regular") (equal weight "")) slant) | |
| 143 (t (concat weight " " slant)))) | |
| 144 | |
| 145 (defun mswindows-frob-font-style (font which) | |
| 146 ;; Given a font name or font instance, return a name with the style field | |
| 147 ;; (which includes weight and/or slant) changed according to WHICH, a plist. | |
| 148 ;; If no entry found, don't change. | |
| 149 (if (null font) nil | |
| 150 (setq font (mswindows-canonicalize-font-name font)) | |
| 151 (or (string-match mswindows-font-regexp font) | |
| 152 (error "can't parse %S" font)) | |
| 153 (let* ((style (match-string 2 font)) | |
| 154 (style-rep | |
| 155 (save-match-data | |
| 156 (or (loop for (x y) on which by #'cddr | |
| 157 if (string-match (concat "^" x "$") style) | |
| 158 return (replace-match y nil nil style)) | |
| 159 style)))) | |
| 160 (concat (substring font 0 (match-beginning 2)) | |
| 161 style-rep | |
| 162 (substring font (match-end 2)))))) | |
| 163 | |
| 164 (defun mswindows-frob-font-style-and-sizify (font which &optional device) | |
| 165 (if (null font) nil | |
| 166 (let* ((oldwidth (if (font-instance-p font) (font-instance-width font) | |
| 167 (let ((fi (make-font-instance font device t))) | |
| 168 (and fi (font-instance-width fi))))) | |
| 169 (newname (mswindows-frob-font-style font which)) | |
| 170 (newfont (make-font-instance newname device t))) | |
| 171 ;; Hack! On MS Windows, bold fonts (even monospaced) are often wider | |
| 172 ;; than the equivalent non-bold font. Making the bold font one point | |
| 173 ;; smaller usually makes it the same width (maybe at the expense of | |
| 174 ;; making it one pixel shorter). Do the same trick in both directions. | |
| 175 (when (font-instance-p newfont) | |
| 176 (let ((newerfont newfont)) | |
| 177 (block nil | |
| 178 (while (and newerfont oldwidth) | |
| 179 (setq newfont newerfont) | |
| 180 (cond ((< (font-instance-width newfont) oldwidth) | |
| 181 (setq newerfont | |
| 182 (make-font-instance | |
| 183 (mswindows-find-larger-font newfont device) | |
| 184 device t)) | |
| 185 (if (and newerfont | |
| 186 (> (font-instance-width newerfont) oldwidth)) | |
| 187 (return nil))) | |
| 188 ((> (font-instance-width newfont) oldwidth) | |
| 189 (setq newerfont | |
| 190 (make-font-instance | |
| 191 (mswindows-find-smaller-font newfont device) | |
| 192 device t)) | |
| 193 (if (and newerfont | |
| 194 (< (font-instance-width newerfont) oldwidth)) | |
| 195 (return nil))) | |
| 196 (t (return nil)))))) | |
| 197 (if (font-instance-p newfont) (font-instance-name newfont) newfont))))) | |
| 198 | |
| 199 (defconst mswindows-nonbold-weight-regexp | |
| 200 ;; He looked so, so cool with the ultra light dangling from his mouth as | |
| 201 ;; his fingers spun out demisemiquavers from the keyboard ... | |
| 202 "\\(Regular\\|Thin\\|Extra Light\\|Ultra Light\\|Light\\|Normal\\|Medium\\|Semi Bold\\|Demi Bold\\)" | |
| 203 ) | |
| 204 (defconst mswindows-bold-weight-regexp | |
| 205 "\\(Semi Bold\\|Demi Bold\\|Bold\\|Extra Bold\\|Ultra Bold\\|Heavy\\|Black\\)" | |
| 206 ) | |
| 207 | |
| 208 (defconst mswindows-make-font-bold-mapper | |
| 209 `(,mswindows-nonbold-weight-regexp "Bold" | |
| 210 "Italic" "Bold Italic" | |
| 211 ,(concat mswindows-nonbold-weight-regexp " Italic") "Bold Italic")) | |
| 212 | |
| 213 (defconst mswindows-make-font-nonbold-mapper | |
| 214 `(,mswindows-bold-weight-regexp "Regular" | |
| 215 ,(concat mswindows-bold-weight-regexp " Italic") "Italic")) | |
| 216 | |
| 217 (defconst mswindows-make-font-italic-mapper | |
| 218 '("\\(.*\\)Italic" "\\1Italic" | |
| 219 "\\(.*\\)" "\\1 Italic")) | |
| 220 | |
| 221 (defconst mswindows-make-font-unitalic-mapper | |
| 222 '("Italic" "Regular" | |
| 223 "\\(.*\\) Italic" "\\1")) | |
| 224 | |
| 225 (defconst mswindows-make-font-bold-italic-mapper | |
| 226 `(,mswindows-nonbold-weight-regexp "Bold Italic" | |
| 227 ,(concat mswindows-nonbold-weight-regexp " Italic") "Bold Italic" | |
| 228 "Italic" "Bold Italic" | |
| 229 ,mswindows-bold-weight-regexp "\\1 Italic")) | |
| 428 | 230 |
| 231 (defun mswindows-make-font-bold (font &optional device) | |
| 232 "Given a mswindows font specification, this attempts to make a bold font. | |
| 233 If it fails, it returns nil." | |
| 872 | 234 (mswindows-frob-font-style-and-sizify font mswindows-make-font-bold-mapper |
| 235 device)) | |
| 428 | 236 |
| 237 (defun mswindows-make-font-unbold (font &optional device) | |
| 238 "Given a mswindows font specification, this attempts to make a non-bold font. | |
| 239 If it fails, it returns nil." | |
| 872 | 240 (mswindows-frob-font-style-and-sizify font mswindows-make-font-nonbold-mapper |
| 241 device)) | |
| 428 | 242 |
| 243 (defun mswindows-make-font-italic (font &optional device) | |
| 244 "Given a mswindows font specification, this attempts to make an `italic' | |
| 245 font. If it fails, it returns nil." | |
| 872 | 246 (try-font-name (mswindows-frob-font-style |
| 247 font mswindows-make-font-italic-mapper) device)) | |
| 428 | 248 |
| 249 (defun mswindows-make-font-unitalic (font &optional device) | |
| 250 "Given a mswindows font specification, this attempts to make a non-italic | |
| 251 font. If it fails, it returns nil." | |
| 872 | 252 (try-font-name (mswindows-frob-font-style |
| 253 font mswindows-make-font-unitalic-mapper) device)) | |
| 428 | 254 |
| 255 (defun mswindows-make-font-bold-italic (font &optional device) | |
| 256 "Given a mswindows font specification, this attempts to make a `bold-italic' | |
| 257 font. If it fails, it returns nil." | |
| 872 | 258 (mswindows-frob-font-style-and-sizify font |
| 259 mswindows-make-font-bold-italic-mapper | |
| 260 device)) | |
| 261 | |
| 262 (defun mswindows-available-font-sizes (font device) | |
| 263 (if (font-instance-p font) (setq font (font-instance-name font))) | |
| 264 (setq font (mswindows-canonicalize-font-name font)) | |
| 265 (or (string-match mswindows-font-regexp font) (error "Can't parse %S" font)) | |
| 266 ;; turn pointsize into wildcard | |
| 267 (setq font | |
| 268 (concat (substring font 0 (match-beginning 3)) | |
| 269 (substring font (match-end 3) (match-end 0)))) | |
| 270 (sort | |
|
5267
668c73e222fd
Change forms like (delq nil (mapcar ...)) to (mapcan ...).
Aidan Kehoe <kehoea@parhasard.net>
parents:
4022
diff
changeset
|
271 (mapcan #'(lambda (name) |
|
668c73e222fd
Change forms like (delq nil (mapcar ...)) to (mapcan ...).
Aidan Kehoe <kehoea@parhasard.net>
parents:
4022
diff
changeset
|
272 (and (string-match mswindows-font-regexp name) |
|
668c73e222fd
Change forms like (delq nil (mapcar ...)) to (mapcan ...).
Aidan Kehoe <kehoea@parhasard.net>
parents:
4022
diff
changeset
|
273 (list (string-to-int (substring name (match-beginning 3) |
|
668c73e222fd
Change forms like (delq nil (mapcar ...)) to (mapcan ...).
Aidan Kehoe <kehoea@parhasard.net>
parents:
4022
diff
changeset
|
274 (match-end 3)))))) |
|
668c73e222fd
Change forms like (delq nil (mapcar ...)) to (mapcan ...).
Aidan Kehoe <kehoea@parhasard.net>
parents:
4022
diff
changeset
|
275 (font-list font device)) |
| 872 | 276 #'<)) |
| 277 | |
| 278 (defun mswindows-frob-font-size (font up-p device) | |
| 279 (if (stringp font) (setq font (make-font-instance font device))) | |
| 280 (let* ((name (font-instance-name font)) | |
| 281 (truename (font-instance-truename font)) | |
| 282 (available (and truename | |
| 283 (mswindows-available-font-sizes truename device)))) | |
| 284 (if (null available) nil | |
| 285 (or (string-match mswindows-font-regexp truename) | |
| 286 (error "can't parse %S" truename)) | |
| 287 (let ((old-size (string-to-int | |
| 288 (substring truename | |
| 289 (match-beginning 3) (match-end 3))))) | |
| 290 (or (> old-size 0) (error "font truename has 0 pointsize?")) | |
| 291 (or (string-match mswindows-font-regexp name) | |
| 292 (error "can't parse %S" name)) | |
| 293 (let ((newsize | |
| 294 ;; scalable fonts: change size by 1 point. | |
| 295 (if (= 0 (car available)) | |
| 296 (if (and (not up-p) (= 1 old-size)) nil | |
| 297 (if up-p (1+ old-size) (1- old-size))) | |
| 298 ;; non-scalable fonts: take the next available size. | |
| 299 (if up-p | |
| 300 (loop for tail on available | |
| 301 if (eql (car tail) old-size) | |
| 302 return (cadr tail)) | |
| 303 (loop for tail on available | |
| 304 if (eql (cadr tail) old-size) | |
| 305 return (car tail)))))) | |
| 306 (and newsize | |
| 307 (concat (substring name 0 (match-beginning 3)) | |
| 308 (int-to-string newsize) | |
| 309 (substring name (match-end 3) (match-end 0))))))))) | |
| 428 | 310 |
| 311 (defun mswindows-find-smaller-font (font &optional device) | |
| 312 "Loads a new version of the given font (or font name) 1 point smaller. | |
| 313 Returns the font if it succeeds, nil otherwise." | |
| 872 | 314 (mswindows-frob-font-size font nil device)) |
| 428 | 315 |
| 316 (defun mswindows-find-larger-font (font &optional device) | |
| 317 "Loads a new version of the given font (or font name) 1 point larger. | |
| 318 Returns the font if it succeeds, nil otherwise." | |
| 872 | 319 (mswindows-frob-font-size font t device)) |