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

diff --git a/ChangeLog b/ChangeLog
index eaddbdde0a09d4496cc38d92f52aeefbbda23c92..2cbec4e08ef7ef4052727591e19a74f0c98af3a4 100644 (file)
--- 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 a76b9286034cac7f2cb1c33c9391a4fea129b376..571bd79dd79a3bd004f13eb7e5b234b7265e6730 100644 (file)
--- 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 f815c9133bef0b540592ea84ceff482d70abb9cd..61fb34e7826130dc4b9ce6865ea20a18aba7f137 100644 (file)
--- 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 2ad125ac172aa50ebe993fb60d9a77f23b407279..a05283c9c3b6eea450531a60571fd623edea1a78 100644 (file)
--- 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 541b4bf28e8677830344f111676aa18bcc225257..cdac70fcc861d79bf2a81e6cc75fa6f9317e09c7 100644 (file)
--- 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)))