Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / scm / stencil.scm

diff --git a/scm/stencil.scm b/scm/stencil.scm
index fdbefd1f0ff04e9abe6f83a4b30e3d2fe13281f0..01694195714c8e3cbfbb3ac5c33f155b5c247971 100644 (file)
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -269,6 +269,19 @@ grestore
        (ly:make-stencil "" '(0 . 0) '(0 . 0)))
     ))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; output signatures.
+
+(define-public (write-system-signatures basename paper-systems count)
+  (if (pair? paper-systems)
+      (begin
+       (let*
+           ((outname (format "~a-~a.signature" basename count)) )
+            
+         (ly:message "Writing ~a" outname)
+         (write-system-signature outname (car paper-systems))
+         (write-system-signatures basename (cdr paper-systems) (1+ count))))))
+
 
 (define-public (write-system-signature filename paper-system)
   (define (float? x)
@@ -276,9 +289,11 @@ grestore
 
   (define system-grob
     (paper-system-system-grob paper-system))
+  
   (define output (open-output-file filename))
   
   (define (strip-floats expr)
+    "Replace floats by #f"
     (cond
      ((float? expr) #f)
      ((ly:font-metric? expr) (ly:font-name expr))
@@ -287,6 +302,7 @@ grestore
      (else expr)))
 
   (define (fold-false-pairs expr)
+    "Try to remove lists of #f as much as possible."
     (if (pair? expr)
        (let*
            ((first (car expr))
@@ -307,7 +323,8 @@ grestore
        (else #f))))
 
   (define (pythonic-string expr)
-    (string-regexp-substitute "'" "\\'" (format "~a" expr)))
+    "escape quotes and slashes for python consumption"
+    (regexp-substitute/global #f "([\\\\'\"])" (format "~a" expr) 'pre "\\" 1 'post))
 
   (define (pythonic-pair expr)
     (format "(~a,~a)"
@@ -342,7 +359,9 @@ grestore
   (define (interpret-for-signature escape collect expr)
     (define (interpret expr)
       (let*
-         ((head (car expr)))
+         ((head (if (pair? expr)
+                    (car expr)
+                    #f)))
 
        (cond
         ((eq? head 'grob-cause) (escape (cdr expr)))
@@ -358,6 +377,11 @@ grestore
 
     (interpret expr))
 
-  (interpret-for-signature found-grob (lambda (x) #f)
-                          (ly:stencil-expr
-                           (paper-system-stencil paper-system))))
+  (if (ly:grob? system-grob)
+      (begin
+       (display (format "# Output signature\n# Generated by LilyPond ~a\n" (lilypond-version))
+                output)
+       (interpret-for-signature found-grob (lambda (x) #f)
+                                (ly:stencil-expr
+                                 (paper-system-stencil paper-system))))))
+