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

[Miles Bader]

Index: emacs/lisp/ps-print.el
diff -c emacs/lisp/ps-print.el:1.137.2.3 emacs/lisp/ps-print.el:1.137.2.4
*** emacs/lisp/ps-print.el:1.137.2.3    Mon Jun 28 07:28:44 2004
--- emacs/lisp/ps-print.el      Fri Jul 23 04:30:38 2004
***************
*** 10,21 ****
  ;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
  ;;    Vinicius Jose Latorre <address@hidden>
  ;; Keywords: wp, print, PostScript
! ;; Time-stamp: <2004/03/10 18:57:00 vinicius>
! ;; Version: 6.6.4
  ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
  
! (defconst ps-print-version "6.6.4"
!   "ps-print.el, v 6.6.4 <2004/03/10 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
--- 10,21 ----
  ;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
  ;;    Vinicius Jose Latorre <address@hidden>
  ;; Keywords: wp, print, PostScript
! ;; Time-stamp: <2004/07/21 23:12:05 vinicius>
! ;; Version: 6.6.5
  ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
  
! (defconst ps-print-version "6.6.5"
!   "ps-print.el, v 6.6.5 <2004/07/21 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
***************
*** 1353,1358 ****
--- 1353,1361 ----
  ;; Acknowledgments
  ;; ---------------
  ;;
+ ;; Thanks to Michael Piotrowski <address@hidden> for improving the DSC
+ ;; compliance of the generated PostScript.
+ ;;
  ;; Thanks to Adam Doppelt <address@hidden> for face mapping suggestion
  ;; for black/white PostScript printers.
  ;;
***************
*** 1424,1430 ****
  ;; initial port to Emacs 19.  His code is no longer part of ps-print, but his
  ;; work is still appreciated.
  ;;
! ;; Thanks to Remi Houdaille and Michel Train, address@hidden, for
  ;; adding underline support.  Their code also is no longer part of ps-print,
  ;; but their efforts are not forgotten.
  ;;
--- 1427,1433 ----
  ;; initial port to Emacs 19.  His code is no longer part of ps-print, but his
  ;; work is still appreciated.
  ;;
! ;; Thanks to Remi Houdaille and Michel Train <address@hidden> for
  ;; adding underline support.  Their code also is no longer part of ps-print,
  ;; but their efforts are not forgotten.
  ;;
***************
*** 4162,4167 ****
--- 4165,4171 ----
  
  (defun ps-message-log-max ()
    (and (not (string= (buffer-name) "*Messages*"))
+        (boundp 'message-log-max)
         message-log-max))
  
  
***************
*** 4210,4216 ****
  
  
  (defvar ps-printing-region nil
!   "Variable used to indicate if the region that ps-print is printing.
  It is a cons, the car of which is the line number where the region begins, and
  its cdr is the total number of lines in the buffer.  Formatting functions can
  use this information to print the original line number (and not the number of
--- 4214,4220 ----
  
  
  (defvar ps-printing-region nil
!   "Variable used to indicate the region that ps-print is printing.
  It is a cons, the car of which is the line number where the region begins, and
  its cdr is the total number of lines in the buffer.  Formatting functions can
  use this information to print the original line number (and not the number of
***************
*** 5396,5404 ****
       ps-adobe-tag
       "%%Title: " (buffer-name)                ; Take job name from name of
                                        ; first buffer printed
!      "\n%%Creator: " (user-full-name)
!      " (using ps-print v" ps-print-version
!      ")\n%%CreationDate: " (format-time-string "%T %b %d %Y")
       "\n%%Orientation: "
       (if ps-landscape-mode "Landscape" "Portrait")
       "\n%%DocumentNeededResources: font Times-Roman Times-Italic\n%%+ font "
--- 5400,5408 ----
       ps-adobe-tag
       "%%Title: " (buffer-name)                ; Take job name from name of
                                        ; first buffer printed
!      "\n%%Creator: ps-print v" ps-print-version
!      "\n%%For: " (user-full-name)
!      "\n%%CreationDate: " (format-time-string "%T %b %d %Y")
       "\n%%Orientation: "
       (if ps-landscape-mode "Landscape" "Portrait")
       "\n%%DocumentNeededResources: font Times-Roman Times-Italic\n%%+ font "
***************
*** 5406,5413 ****
                (ps-remove-duplicates
                 (append (ps-fonts 'ps-font-for-text)
                         (list (ps-font 'ps-font-for-header 'normal)
!                              (ps-font 'ps-font-for-header 'bold))))
                "\n%%+ font ")
       "\n%%DocumentMedia: " (ps-page-dimensions-get-media dimensions)
       (format " %d" (round (ps-page-dimensions-get-width dimensions)))
       (format " %d" (round (ps-page-dimensions-get-height dimensions)))
--- 5410,5420 ----
                (ps-remove-duplicates
                 (append (ps-fonts 'ps-font-for-text)
                         (list (ps-font 'ps-font-for-header 'normal)
!                              (ps-font 'ps-font-for-header 'bold)
!                              (ps-font 'ps-font-for-footer 'normal)
!                              (ps-font 'ps-font-for-footer 'bold))))
                "\n%%+ font ")
+      "\n%%DocumentSuppliedResources: procset PSPrintUserDefinedPrologue-" 
(user-login-name) " 0 0"
       "\n%%DocumentMedia: " (ps-page-dimensions-get-media dimensions)
       (format " %d" (round (ps-page-dimensions-get-width dimensions)))
       (format " %d" (round (ps-page-dimensions-get-height dimensions)))
***************
*** 5427,5437 ****
                                       ps-error-handler-alist))
                           1))          ; send to paper
               ps-print-prologue-0
!              "\n%%BeginProcSet: UserDefinedPrologue\n\n")
  
      (ps-insert-string ps-user-defined-prologue)
  
!     (ps-output "\n%%EndProcSet\n\n")
  
      (ps-output-boolean "LandscapeMode      "
                       (or ps-landscape-mode
--- 5434,5444 ----
                                       ps-error-handler-alist))
                           1))          ; send to paper
               ps-print-prologue-0
!              "\n%%BeginResource: procset PSPrintUserDefinedPrologue-" 
(user-login-name) " 0 0\n\n")
  
      (ps-insert-string ps-user-defined-prologue)
  
!     (ps-output "\n%%EndResource\n\n")
  
      (ps-output-boolean "LandscapeMode      "
                       (or ps-landscape-mode
***************
*** 5543,5548 ****
--- 5550,5570 ----
      (mapcar 'ps-output ps-background-all-pages)
      (ps-output "}def\n/printLocalBackground{\n}def\n")
  
+     (ps-output "\n%%EndProlog\n\n%%BeginSetup\n")
+ 
+     (ps-output
+      "\n%%IncludeResource: font Times-Roman"
+      "\n%%IncludeResource: font Times-Italic\n%%IncludeResource: font "
+      (mapconcat 'identity
+               (ps-remove-duplicates
+                (append (ps-fonts 'ps-font-for-text)
+                        (list (ps-font 'ps-font-for-header 'normal)
+                              (ps-font 'ps-font-for-header 'bold)
+                              (ps-font 'ps-font-for-footer 'normal)
+                              (ps-font 'ps-font-for-footer 'bold))))
+               "\n%%IncludeResource: font ")
+      "\n")
+ 
      ;; Header/line number fonts
      (ps-output (format "/h0 %s(%s)cvn DefFont\n" ; /h0 14/Helvetica-Bold 
DefFont
                       ps-header-title-font-size-internal
***************
*** 5586,5592 ****
        (ps-output (format "/SpaceWidthRatio %f def\n"
                         (/ (ps-lookup 'space-width) (ps-lookup 'size)))))
  
-     (ps-output "\n%%EndProlog\n\n%%BeginSetup\n")
      (unless (eq ps-spool-config 'lpr-switches)
        (ps-output "\n%%BeginFeature: *Duplex "
                 (ps-boolean-capitalized ps-spool-duplex)
--- 5608,5613 ----