[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.4 emacs/lisp/ps-print.el:1.137.2.5
*** emacs/lisp/ps-print.el:1.137.2.4    Fri Jul 23 04:30:38 2004
--- emacs/lisp/ps-print.el      Wed Jul 28 07:05:50 2004
***************
*** 5544,5560 ****
      (setq ps-background-all-pages (nreverse ps-background-all-pages)
          ps-background-pages (nreverse ps-background-pages))
  
!     (ps-output "\n" ps-print-prologue-1)
! 
!     (ps-output "\n/printGlobalBackground{\n")
      (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)
--- 5544,5558 ----
      (setq ps-background-all-pages (nreverse ps-background-all-pages)
          ps-background-pages (nreverse ps-background-pages))
  
!     (ps-output "\n" ps-print-prologue-1
!              "\n/printGlobalBackground{\n")
      (mapcar 'ps-output ps-background-all-pages)
      (ps-output
+      "}def\n/printLocalBackground{\n}def\n"
+      "\n%%EndProlog\n\n%%BeginSetup\n"
       "\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)
***************
*** 5563,5584 ****
                               (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
!                      (ps-font 'ps-font-for-header 'bold))
!              (format "/h1 %s(%s)cvn DefFont\n" ; /h1 12/Helvetica DefFont
!                      ps-header-font-size-internal
!                      (ps-font 'ps-font-for-header 'normal))
!              (format "/L0 %s(%s)cvn DefFont\n" ; /L0 6/Times-Italic DefFont
!                      (ps-get-font-size 'ps-line-number-font-size)
!                      ps-line-number-font)
!              (format "/H0 %s(%s)cvn DefFont\n" ; /H0 12/Helvetica DefFont
!                      ps-footer-font-size-internal
!                      (ps-font 'ps-font-for-footer 'normal))
!              "\n\n% ---- These lines must be kept together because...
  
  /h0 F
  /HeaderTitleLineHeight FontHeight def
--- 5561,5580 ----
                               (ps-font 'ps-font-for-footer 'normal)
                               (ps-font 'ps-font-for-footer 'bold))))
                "\n%%IncludeResource: font ")
!      ;; Header/line number fonts
!      (format "\n/h0 %s(%s)cvn DefFont\n" ; /h0 14/Helvetica-Bold DefFont
!            ps-header-title-font-size-internal
!            (ps-font 'ps-font-for-header 'bold))
!      (format "/h1 %s(%s)cvn DefFont\n"        ; /h1 12/Helvetica DefFont
!            ps-header-font-size-internal
!            (ps-font 'ps-font-for-header 'normal))
!      (format "/L0 %s(%s)cvn DefFont\n"        ; /L0 6/Times-Italic DefFont
!            (ps-get-font-size 'ps-line-number-font-size)
!            ps-line-number-font)
!      (format "/H0 %s(%s)cvn DefFont\n"        ; /H0 12/Helvetica DefFont
!            ps-footer-font-size-internal
!            (ps-font 'ps-font-for-footer 'normal))
!      "\n\n% ---- These lines must be kept together because...
  
  /h0 F
  /HeaderTitleLineHeight FontHeight def