[Emacs-diffs] Changes to emacs/lisp/ps-print.el,v

[Vinicius Jose Latorre]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Vinicius Jose Latorre <viniciusjl>      08/01/09 02:54:16

Index: ps-print.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ps-print.el,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- ps-print.el 8 Jan 2008 20:45:00 -0000       1.209
+++ ps-print.el 9 Jan 2008 02:54:16 -0000       1.210
@@ -10,11 +10,11 @@
 ;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
 ;;     Vinicius Jose Latorre <address@hidden>
 ;; 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)
@@ -6587,7 +6596,10 @@
   (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
+                       (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))))