Mercurial > emacs
changeset 87654:85fe2f3f4acb
Fix face attributes recognition
author | Vinicius Jose Latorre <viniciusjl@ig.com.br> |
---|---|
date | Wed, 09 Jan 2008 02:54:16 +0000 |
parents | 3091cbee6fd8 |
children | 16eb0851e929 |
files | lisp/ChangeLog lisp/ps-print.el |
diffstat | 2 files changed, 26 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jan 09 02:16:47 2008 +0000 +++ b/lisp/ChangeLog Wed Jan 09 02:54:16 2008 +0000 @@ -1,3 +1,11 @@ +2008-01-09 Vinicius Jose Latorre <viniciusjl@ig.com.br> + + * ps-print.el: Some face attributes (like :strike-through) was not + being recognised. Reported by Leo <sdl.web@gmail.com>. + (ps-print-version): New version 6.8.2. + (ps-face-strikout-p, ps-face-overline-p, ps-face-box-p): New funs. + (ps-screen-to-bit-face): Fix code. + 2008-01-09 Stefan Monnier <monnier@iro.umontreal.ca> * ffap.el (ffap-read-file-or-url): Don't use let-binding to temporarily
--- a/lisp/ps-print.el Wed Jan 09 02:16:47 2008 +0000 +++ b/lisp/ps-print.el Wed Jan 09 02:54:16 2008 +0000 @@ -10,11 +10,11 @@ ;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters) ;; Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Keywords: wp, print, PostScript -;; Version: 6.8.1 +;; Version: 6.8.2 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre -(defconst ps-print-version "6.8.1" - "ps-print.el, v 6.8.1 <2007/11/21 vinicius> +(defconst ps-print-version "6.8.2" + "ps-print.el, v 6.8.2 <2008/01/08 vinicius> Vinicius's last change version -- this file may have been edited as part of Emacs without changes to the version number. When reporting bugs, please also @@ -3996,6 +3996,15 @@ (or (face-italic-p face) (memq face ps-italic-faces)))) +(defun ps-face-strikeout-p (face) + (eq (face-attribute face :strike-through) t)) + +(defun ps-face-overline-p (face) + (eq (face-attribute face :overline) t)) + +(defun ps-face-box-p (face) + (not (memq (face-attribute face :box) '(nil unspecified)))) + (defvar ps-print-color-scale 1.0) (defun ps-color-scale (color) @@ -6585,9 +6594,12 @@ (defun ps-screen-to-bit-face (face) (cons face - (vector (logior (if (ps-face-bold-p face) 1 0) ; bold - (if (ps-face-italic-p face) 2 0) ; italic - (if (ps-face-underlined-p face) 4 0)) ; underline + (vector (logior (if (ps-face-bold-p face) 1 0) ; bold + (if (ps-face-italic-p face) 2 0) ; italic + (if (ps-face-underlined-p face) 4 0) ; underline + (if (ps-face-strikeout-p face) 8 0) ; strikeout + (if (ps-face-overline-p face) 16 0) ; overline + (if (ps-face-box-p face) 64 0)) ; box (ps-face-foreground-name face) (ps-face-background-name face))))