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

[Vinicius Jose Latorre]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Vinicius Jose Latorre <viniciusjl>      08/01/09 03:45:04

Index: ps-print.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ps-print.el,v
retrieving revision 1.181.2.10
retrieving revision 1.181.2.11
diff -u -b -r1.181.2.10 -r1.181.2.11
--- ps-print.el 7 Jan 2008 02:44:22 -0000       1.181.2.10
+++ ps-print.el 9 Jan 2008 03:45:04 -0000       1.181.2.11
@@ -3923,6 +3923,12 @@
         (or (ps-xemacs-face-kind-p face 'ANGLE_NAME "i\\|o")
             (ps-xemacs-face-kind-p face 'SLANT "i\\|o")
             (memq face ps-italic-faces))) ; Kludge-compatible
+
+       (defalias 'ps-face-strikeout-p 'ignore)
+
+       (defalias 'ps-face-overline-p 'ignore)
+
+       (defalias 'ps-face-box-p 'ignore)
        )
 
       (t                               ; Emacs
@@ -3943,6 +3949,15 @@
        (defun ps-face-italic-p (face)
         (or (ps-e-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))))
        ))
 
 
@@ -6510,7 +6525,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))))