Mercurial > emacs
diff lisp/ps-print.el @ 89957:c08afac24467
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-26
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-466
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-470
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 28 Jul 2004 07:05:52 +0000 |
parents | b9eee0a7bef5 12ee8343c078 |
children | f2ebccfa87d4 |
line wrap: on
line diff
--- a/lisp/ps-print.el Fri Jul 23 04:30:44 2004 +0000 +++ b/lisp/ps-print.el Wed Jul 28 07:05:52 2004 +0000 @@ -5544,17 +5544,15 @@ (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") + (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") - - (ps-output "\n%%EndProlog\n\n%%BeginSetup\n") - (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 " + "\n%%IncludeResource: font Times-Italic" + "\n%%IncludeResource: font " (mapconcat 'identity (ps-remove-duplicates (append (ps-fonts 'ps-font-for-text) @@ -5563,22 +5561,20 @@ (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... + ;; 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