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

[Miles Bader]

Index: emacs/lisp/ps-print.el
diff -c emacs/lisp/ps-print.el:1.133 emacs/lisp/ps-print.el:1.134
*** emacs/lisp/ps-print.el:1.133        Thu Feb 13 06:54:34 2003
--- emacs/lisp/ps-print.el      Wed Mar  5 20:54:17 2003
***************
*** 5,28 ****
  
  ;; Author: Jim Thompson (was <address@hidden>)
  ;;    Jacques Duthen (was <address@hidden>)
! ;;    Vinicius Jose Latorre <address@hidden>
  ;;    Kenichi Handa <address@hidden> (multi-byte characters)
  ;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
! ;;    Vinicius Jose Latorre <address@hidden>
  ;; Keywords: wp, print, PostScript
! ;; Time-stamp: <2003/02/12 14:05:44 vinicius>
! ;; Version: 6.5.9
  ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
  
! (defconst ps-print-version "6.5.9"
!   "ps-print.el, v 6.5.9 <2003/02/12 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
  report the version of Emacs, if any, that ps-print was distributed with.
  
  Please send all bug fixes and enhancements to
!       Vinicius Jose Latorre <address@hidden>.")
  
  ;; This file is part of GNU Emacs.
  
--- 5,28 ----
  
  ;; Author: Jim Thompson (was <address@hidden>)
  ;;    Jacques Duthen (was <address@hidden>)
! ;;    Vinicius Jose Latorre <address@hidden>
  ;;    Kenichi Handa <address@hidden> (multi-byte characters)
  ;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
! ;;    Vinicius Jose Latorre <address@hidden>
  ;; Keywords: wp, print, PostScript
! ;; Time-stamp: <2003/03/05 21:54:55 vinicius>
! ;; Version: 6.6
  ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
  
! (defconst ps-print-version "6.6"
!   "ps-print.el, v 6.6 <2003/03/05 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
  report the version of Emacs, if any, that ps-print was distributed with.
  
  Please send all bug fixes and enhancements to
!       Vinicius Jose Latorre <address@hidden>.")
  
  ;; This file is part of GNU Emacs.
  
***************
*** 1075,1081 ****
  ;;    (face...)       list of faces whose background color will be used.
  ;;
  ;; Any other value will be treated as t.
! ;; The default value is t.
  ;;
  ;;
  ;; How Ps-Print Deals With Color
--- 1075,1081 ----
  ;;    (face...)       list of faces whose background color will be used.
  ;;
  ;; Any other value will be treated as t.
! ;; The default value is nil.
  ;;
  ;;
  ;; How Ps-Print Deals With Color
***************
*** 1211,1217 ****
  ;; New since version 2.8
  ;; ---------------------
  ;;
! ;; [vinicius] Vinicius Jose Latorre <address@hidden>
  ;;
  ;;    20010619
  ;;     `ps-time-stamp-locale-default'
--- 1211,1217 ----
  ;; New since version 2.8
  ;; ---------------------
  ;;
! ;; [vinicius] Vinicius Jose Latorre <address@hidden>
  ;;
  ;;    20010619
  ;;     `ps-time-stamp-locale-default'
***************
*** 1263,1269 ****
  ;;
  ;; `ps-print-region-function'
  ;;
! ;; [vinicius] Vinicius Jose Latorre <address@hidden>
  ;;
  ;;    19990301
  ;;     PostScript tumble and setpagedevice.
--- 1263,1269 ----
  ;;
  ;; `ps-print-region-function'
  ;;
! ;; [vinicius] Vinicius Jose Latorre <address@hidden>
  ;;
  ;;    19990301
  ;;     PostScript tumble and setpagedevice.
***************
*** 1276,1282 ****
  ;;
  ;; Multi-byte buffer handling.
  ;;
! ;; [vinicius] Vinicius Jose Latorre <address@hidden>
  ;;
  ;;    19980306
  ;;     Skip invisible text.
--- 1276,1282 ----
  ;;
  ;; Multi-byte buffer handling.
  ;;
! ;; [vinicius] Vinicius Jose Latorre <address@hidden>
  ;;
  ;;    19980306
  ;;     Skip invisible text.
***************
*** 1708,1714 ****
  requirements and set %%LanguageLevel: to 2, do:
  
   (setq ps-print-prologue-header
!       \"%%+ numcopies(3) jog\\n%%LanguageLevel: 2\\n\")
  
  The duplex requirement is inserted by ps-print (see `ps-spool-duplex').
  
--- 1708,1714 ----
  requirements and set %%LanguageLevel: to 2, do:
  
   (setq ps-print-prologue-header
!        \"%%+ numcopies(3) jog\\n%%LanguageLevel: 2\\n\")
  
  The duplex requirement is inserted by ps-print (see `ps-spool-duplex').
  
***************
*** 1906,1912 ****
  
  If a list, the lists element may be an integer or a cons cell (FROM . TO)
  designating FROM page to TO page; any invalid element is ignored, that is, an
! integer less than one or if FROM is greater than TO.
  
  Otherwise, it's treated as nil.
  
--- 1906,1912 ----
  
  If a list, the lists element may be an integer or a cons cell (FROM . TO)
  designating FROM page to TO page; any invalid element is ignored, that is, an
! integer lesser than one or if FROM is greater than TO.
  
  Otherwise, it's treated as nil.
  
***************
*** 2918,2924 ****
    :group 'ps-print-color)
  
  (defcustom ps-default-fg '(0.0 0.0 0.0) ; black
!   "*RGB values of the default foreground color.  Defaults to black."
    :type '(choice :menu-tag "Default Foreground Gray/Color"
                 :tag "Default Foreground Gray/Color"
                 (const :tag "Session Foreground" t)
--- 2918,2950 ----
    :group 'ps-print-color)
  
  (defcustom ps-default-fg '(0.0 0.0 0.0) ; black
!   "*RGB values of the default foreground color.  Defaults to black.
! 
! The `ps-default-fg' variable contains the default foreground color used by
! ps-print, that is, if there is a face in a text that doesn't have a foreground
! color, the `ps-default-fg' color should be used.
! 
! Valid values are:
! 
!    t          The foreground color of Emacs session will be used.
! 
!    NUMBER     It's a real value between 0.0 (black) and 1.0 (white) that
!               indicate the gray color.
! 
!    COLOR-NAME It's a string wich contains the color name.  For example:
!               \"yellow\".
! 
!    LIST               It's a list of RGB values, that is a list of three real 
values
!               of the form:
! 
!                 (RED, GREEN, BLUE)
! 
!               Where RED, GREEN and BLUE are reals between 0.0 (no color) and
!               1.0 (full color).
! 
! Any other value is ignored and it's used the black color.
! 
! It's used only when `ps-print-color-p' is non-nil."
    :type '(choice :menu-tag "Default Foreground Gray/Color"
                 :tag "Default Foreground Gray/Color"
                 (const :tag "Session Foreground" t)
***************
*** 2931,2937 ****
    :group 'ps-print-color)
  
  (defcustom ps-default-bg '(1.0 1.0 1.0) ; white
!   "*RGB values of the default background color.  Defaults to white."
    :type '(choice :menu-tag "Default Background Gray/Color"
                 :tag "Default Background Gray/Color"
                 (const :tag "Session Background" t)
--- 2957,2991 ----
    :group 'ps-print-color)
  
  (defcustom ps-default-bg '(1.0 1.0 1.0) ; white
!   "*RGB values of the default background color.  Defaults to white.
! 
! The `ps-default-bg' variable contains the default background color used by
! ps-print, that is, if there is a face in a text that doesn't have a background
! color, the `ps-default-bg' color should be used.
! 
! Valid values are:
! 
!    t          The background color of Emacs session will be used.
! 
!    NUMBER     It's a real value between 0.0 (black) and 1.0 (white) that
!               indicate the gray color.
! 
!    COLOR-NAME It's a string wich contains the color name.  For example:
!               \"yellow\".
! 
!    LIST               It's a list of RGB values, that is a list of three real 
values
!               of the form:
! 
!                 (RED, GREEN, BLUE)
! 
!               Where RED, GREEN and BLUE are reals between 0.0 (no color) and
!               1.0 (full color).
! 
! Any other value is ignored and it's used the white color.
! 
! It's used only when `ps-print-color-p' is non-nil.
! 
! See also `ps-use-face-background'."
    :type '(choice :menu-tag "Default Background Gray/Color"
                 :tag "Default Background Gray/Color"
                 (const :tag "Session Background" t)
***************
*** 3817,3822 ****
--- 3871,3877 ----
  
  (defvar ps-current-font 0)
  (defvar ps-default-foreground nil)
+ (defvar ps-default-background nil)
  (defvar ps-default-color nil)
  (defvar ps-current-color nil)
  (defvar ps-current-bg nil)
***************
*** 5385,5395 ****
               "/ZebraColor       "
               (ps-format-color ps-zebra-color 0.95)
               "def\n/BackgroundColor  "
!              (ps-format-color
!               (if (eq ps-default-bg t)
!                   (ps-face-background-name 'default)
!                 ps-default-bg)
!               1.0)
               "def\n/UseSetpagedevice "
               (if (eq ps-spool-config 'setpagedevice)
                   "/setpagedevice where{pop languagelevel 2 eq}{false}ifelse"
--- 5440,5446 ----
               "/ZebraColor       "
               (ps-format-color ps-zebra-color 0.95)
               "def\n/BackgroundColor  "
!              (ps-format-color ps-default-background 1.0)
               "def\n/UseSetpagedevice "
               (if (eq ps-spool-config 'setpagedevice)
                   "/setpagedevice where{pop languagelevel 2 eq}{false}ifelse"
***************
*** 5573,5582 ****
    (ps-get-size (symbol-value font-sym) "font size" font-sym))
  
  
! (defsubst ps-rgb-color (color default)
!   (cond ((and color (listp color)) color)
        ((stringp color) (ps-color-scale color))
-       ((numberp color) (list color color color))
        (t (list default default default))
        ))
  
--- 5624,5642 ----
    (ps-get-size (symbol-value font-sym) "font size" font-sym))
  
  
! (defun ps-rgb-color (color default)
!   (cond ((and color (listp color) (= (length color) 3)
!             (let ((cl color)
!                   (ok t) e)
!               (while (and ok cl)
!                 (setq e  (car cl)
!                       cl (cdr cl)
!                       ok (and (floatp e) (<= 0.0 e) (<= e 1.0))))
!               ok))
!        color)
!       ((and (floatp color) (<= 0.0 color) (<= color 1.0))
!        (list color color color))
        ((stringp color) (ps-color-scale color))
        (t (list default default default))
        ))
  
***************
*** 5650,5655 ****
--- 5710,5720 ----
              ((eq ps-print-control-characters 'control)
               "[\000-\037\177]")
              (t "[\t\n\f]"))
+       ps-default-background (ps-rgb-color
+                              (if (eq ps-default-bg t)
+                                  (ps-face-background-name 'default)
+                                ps-default-bg)
+                              1.0)
        ps-default-foreground (ps-rgb-color
                               (if (eq ps-default-fg t)
                                   (ps-face-foreground-name 'default)
***************
*** 5665,5671 ****
                                 (float (car (ps-color-values "white")))
                               1.0))
    ;; initialize page dimensions
!   (ps-get-page-dimensions))
  
  
  (defun ps-page-number ()
--- 5730,5743 ----
                                 (float (car (ps-color-values "white")))
                               1.0))
    ;; initialize page dimensions
!   (ps-get-page-dimensions)
!   ;; final check
!   (and ps-color-p
!        (equal ps-default-background ps-default-foreground)
!        (error
!       (concat
!        "`ps-default-fg' and `ps-default-bg' have the same color.\n"
!        "Text won't appear on page.  Please, check these variables."))))
  
  
  (defun ps-page-number ()