From: hanwen <hanwen>
Date: Fri, 21 Apr 2006 13:38:46 +0000 (+0000)
Subject: (eps-file->stencil): fix EPS PS embedding code
X-Git-Tag: release/2.8.2~9^2~81
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9aa0f9a046093712c54dfdd49bb26cca9cd664c2;p=lilypond.git

(eps-file->stencil): fix EPS PS embedding code
---

diff --git a/ChangeLog b/ChangeLog
index eaddbdde0a..2cbec4e08e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* scm/stencil.scm (eps-file->stencil): fix EPS PS embedding code 
+
 2006-04-21  Erlend Aasland  <erlenda@gmail.com>
 
 	* ly/engraver-init.ly: remove old comments from TabVoice
diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index a76b928603..571bd79dd7 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -80,6 +80,9 @@ applyContext =
 
 shiftDurations =
 #(define-music-function (parser location dur dots arg) (integer? integer? ly:music?)
+   ""
+
+   
    (music-map
     (lambda (x)
       (shift-one-duration-log x dur dots)) arg))
diff --git a/scm/c++.scm b/scm/c++.scm
index f815c9133b..61fb34e782 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -46,7 +46,8 @@
 
 (define-public (object-type obj)
   (match-predicate obj type-p-name-alist))
-
+(define-public (object-type-name obj)
+  (type-name (match-predicate obj type-p-name-alist)))
 (define-public (type-name predicate)
   (let ((entry (assoc predicate type-p-name-alist)))
     (if (pair? entry) (cdr entry)
diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 2ad125ac17..a05283c9c3 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -324,7 +324,6 @@ Syntax
     (NoteEvent
      . (
 	(description .	"A note.")
-
 	(types . (general-music event note-event rhythmic-event melodic-event))
 	))
     
diff --git a/scm/stencil.scm b/scm/stencil.scm
index 541b4bf28e..cdac70fcc8 100644
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -19,7 +19,9 @@
    ((null? stils) empty-stencil)
    ((null? (cdr stils)) (car stils))
    (else (ly:stencil-combine-at-edge
-	  (car stils) axis dir (stack-stencils-padding-list axis dir (cdr padding) (cdr stils))
+	  (car stils)
+	  axis dir
+	  (stack-stencils-padding-list axis dir (cdr padding) (cdr stils))
 	  (car padding)))))
 
 (define-public (centered-stencil stencil)
@@ -246,7 +248,10 @@ encloses the contents.
 	  'embedded-ps
 	  (string-append
 	   (format
-	   "BeginEPSF
+	   "
+gsave
+currentpoint translate
+BeginEPSF
 ~a ~a scale
 %%BeginDocument: ~a
 " 	   factor factor
@@ -254,7 +259,9 @@ encloses the contents.
 	   )
 	   contents
 	   "%%EndDocument
-EndEPSF"))
+EndEPSF
+grestore
+"))
 	
 	 (cons (list-ref scaled-bbox 0) (list-ref scaled-bbox 2))
 	 (cons (list-ref scaled-bbox 1) (list-ref scaled-bbox 3)))