From 9f0d7422de995738d5573a531cec177143f2f34b Mon Sep 17 00:00:00 2001
From: janneke <janneke>
Date: Thu, 11 Aug 2005 13:02:02 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog            |  5 +++++
 scm/define-grobs.scm |  6 ++++++
 scm/framework-ps.scm | 14 ++------------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b011a61f2..be61aa8262 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-10  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* scm/framework-ps.scm (output-framework): Backport-bugfix: use
+	2.6 interface of paper-outputter.
+
 2005-08-10  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
 	* scm/define-markup-commands.scm (normal-text): Added 2 new
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index af4685a65d..f0257d8d8b 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -387,6 +387,7 @@
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(self-alignment-X . 0)
 	(no-spacing-rods . #t)
+	(slur-padding . 0.5)
 	(script-priority . 100)
 	(font-series . bold)
 	(font-encoding . fetaDynamic)
@@ -402,6 +403,7 @@
 ;	(font-series . bold)
 	(font-shape . italic)
 	(style . dashed-line)
+	(slur-padding . 0.5)
 
 	; need to blend with dynamic texts.
 	(font-size . 1)
@@ -421,6 +423,7 @@
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(staff-padding . 0.1)
 	(padding . 0.6)
+	(slur-padding . 0.5)
 	(minimum-space . 1.2)
 	(direction . -1)
 	
@@ -455,6 +458,7 @@
 
 	; sync with TextScript (?)
 	(padding . 0.5)
+	(slur-padding . 0.5)
 	(staff-padding . 0.5)
 	(self-alignment-X . 0)
 	(self-alignment-Y . 0)
@@ -963,6 +967,7 @@
 	;; This value is sensitive: if too large, staccato dots will move a
 	;; space a away.
 	(padding . 0.20)
+	(slur-padding . 0.5)
 	(staff-padding . 0.25)
 	;; (script-priority . 0) priorities for scripts, see script.scm
 	(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent))
@@ -1226,6 +1231,7 @@
 
 	; sync with Fingering ?
 	(padding . 0.5)
+	(slur-padding . 0.5)
 	(staff-padding . 0.5)
 	(script-priority . 200)
 	;; todo: add X self alignment?
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 8e05912368..6bfa6de5ef 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -407,12 +407,7 @@
 
 (define-public (output-framework basename book scopes fields)
   (let* ((filename (format "~a.ps" basename))
-	 (outputter (ly:make-paper-outputter
-		     ;; FIXME: better wrap open/open-file,
-		     ;; content-mangling is always bad.
-		     ;; MINGW hack: need to have "b"inary for embedding CFFs
-		     (open-file filename "wb")
-		     "ps"))
+	 (outputter (ly:make-paper-outputter filename "ps"))
 	 (paper (ly:paper-book-paper book))
 	 (pages (ly:paper-book-pages book))
 	 (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
@@ -455,12 +450,7 @@
 	  (max (1+ (car box)) (caddr box))
 	  (max (1+ (cadr box)) (cadddr box)))))
 
-  (let* ((outputter (ly:make-paper-outputter
-		     ;; FIXME: better wrap open/open-file,
-		     ;; content-mangling is always bad.
-		     ;; MINGW hack: need to have "b"inary for embedding CFFs
-		     (open-file (format "~a.eps" filename) "wb")
-		     "ps"))
+  (let* ((outputter (ly:make-paper-outputter (format "~a.eps" filename) "ps"))
 	 (port (ly:outputter-port outputter))
 	 (xext (ly:stencil-extent dump-me X))
 	 (yext (ly:stencil-extent dump-me Y))
-- 
2.39.5