procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.

Browse source
This commit is contained in:
Simon Marshall 1995-12-12 08:20:37 +00:00
parent 7d826aa9d2
commit b7ffee5fb7
1 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
lisp/faces.el
View file

@ -629,36 +629,40 @@ also the same size as FACE on FRAME, or fail."
(cdr (assq 'font (frame-parameters (selected-frame))))))
(defun x-frob-font-weight (font which)
(cond ((string-match x-font-regexp font)
(concat (substring font 0 (match-beginning x-font-regexp-weight-subnum))
which
(substring font (match-end x-font-regexp-weight-subnum)
(match-beginning x-font-regexp-adstyle-subnum))
;; Replace the ADD_STYLE_NAME field with *
;; because the info in it may not be the same
;; for related fonts.
"*"
(substring font (match-end x-font-regexp-adstyle-subnum))))
((or (string-match x-font-regexp-head font)
(string-match x-font-regexp-weight font))
(concat (substring font 0 (match-beginning 1)) which
(substring font (match-end 1))))))
(let ((case-fold-search t))
(cond ((string-match x-font-regexp font)
(concat (substring font 0
(match-beginning x-font-regexp-weight-subnum))
which
(substring font (match-end x-font-regexp-weight-subnum)
(match-beginning x-font-regexp-adstyle-subnum))
;; Replace the ADD_STYLE_NAME field with *
;; because the info in it may not be the same
;; for related fonts.
"*"
(substring font (match-end x-font-regexp-adstyle-subnum))))
((or (string-match x-font-regexp-head font)
(string-match x-font-regexp-weight font))
(concat (substring font 0 (match-beginning 1)) which
(substring font (match-end 1)))))))
(defun x-frob-font-slant (font which)
(cond ((string-match x-font-regexp font)
(concat (substring font 0 (match-beginning x-font-regexp-slant-subnum))
which
(substring font (match-end x-font-regexp-slant-subnum)
(match-beginning x-font-regexp-adstyle-subnum))
;; Replace the ADD_STYLE_NAME field with *
;; because the info in it may not be the same
;; for related fonts.
"*"
(substring font (match-end x-font-regexp-adstyle-subnum))))
((or (string-match x-font-regexp-head font)
(string-match x-font-regexp-slant font))
(concat (substring font 0 (match-beginning 1)) which
(substring font (match-end 1))))))
(let ((case-fold-search t))
(cond ((string-match x-font-regexp font)
(concat (substring font 0
(match-beginning x-font-regexp-slant-subnum))
which
(substring font (match-end x-font-regexp-slant-subnum)
(match-beginning x-font-regexp-adstyle-subnum))
;; Replace the ADD_STYLE_NAME field with *
;; because the info in it may not be the same
;; for related fonts.
"*"
(substring font (match-end x-font-regexp-adstyle-subnum))))
((or (string-match x-font-regexp-head font)
(string-match x-font-regexp-slant font))
(concat (substring font 0 (match-beginning 1)) which
(substring font (match-end 1)))))))
(defun x-make-font-bold (font)
"Given an X font specification, make a bold version of it.