Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / scm / lily-library.scm

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index f450731052159f94d439b017896a9b8f2b347d4f..d178c6926c80d7a6c1d1b6c9e9c1d8cb3dcf16b9 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -1,8 +1,9 @@
+;;;;
 ;;;; lily-library.scm -- utilities
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
@@ -44,19 +45,19 @@
 ;; parser stuff.
 (define-public (print-music-as-book parser music)
   (let* ((head (ly:parser-lookup parser '$defaultheader))
-        (book (ly:make-book (ly:parser-lookup parser $defaultpaper)
-                            head score)))
-    (ly:parser-print-book parser book)))
+        (book (ly:make-book (ly:parser-lookup parser '$defaultpaper)
+                            head (scorify-music music parser))))
+    (print-book-with-defaults parser book)))
 
 (define-public (print-score-as-book parser score)
   (let* ((head (ly:parser-lookup parser '$defaultheader))
-        (book (ly:make-book (ly:parser-lookup parser $defaultpaper)
+        (book (ly:make-book (ly:parser-lookup parser '$defaultpaper)
                             head score)))
-    (ly:parser-print-book parser book)))
+    (print-book-with-defaults parser book)))
 
 (define-public (print-score parser score)
   (let* ((head (ly:parser-lookup parser '$defaultheader))
-        (book (ly:make-book (ly:parser-lookup parser $defaultpaper)
+        (book (ly:make-book (ly:parser-lookup parser '$defaultpaper)
                             head score)))
     (ly:parser-print-score parser book)))
                
@@ -75,7 +76,10 @@
   (ly:make-score music))
 
 (define-public (collect-music-for-book parser music)
-  (collect-scores-for-book parser (scorify-music music parser)))
+  ;; discard music if its 'void property is true.
+  (let ((void-music (ly:music-property music 'void)))
+    (if (or (null? void-music) (not void-music))
+        (collect-scores-for-book parser (scorify-music music parser)))))
 
 
 (define-public (print-book-with-defaults parser book)
@@ -110,11 +114,10 @@
        (set! base (format #f "~a-~a" base count)))
 
     (ly:parser-define! parser 'output-count (1+ count))
-    
-
     (ly:score-process score header paper layout base)
     ))
 
+
 ;;;;;;;;;;;;;;;;
 ;; alist
 (define-public assoc-get ly:assoc-get)
@@ -201,7 +204,12 @@ found."
 (if (not (defined? 'hash-table?)) ;; guile 1.6 compat
     (begin
       (define hash-table? vector?)
-
+      (define-public (hash-for-each proc tab)
+       (hash-fold (lambda (k v prior)
+                    (proc k v)
+                    #f)
+                  #f
+                  tab))
       (define-public (hash-table->alist t)
        "Convert table t to list"
        (apply append (vector->list t))))
@@ -302,19 +310,60 @@ found."
 (define-public (offset-flip-y o)
   (cons (car o) (- (cdr o))))
 
+(define-public (offset-scale o scale)
+  (cons (* (car o) scale)
+       (* (cdr o) scale)))
+
 (define-public (ly:list->offsets accum coords)
   (if (null? coords)
       accum
       (cons (cons (car coords) (cadr coords))
            (ly:list->offsets accum (cddr coords)))))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; numbers
+
+(if (not (defined? 'nan?)) ;; guile 1.6 compat
+    (define-public (nan? x) (not (or (< 0.0 x)
+                                    (> 0.0 x)
+                                    (= 0.0 x)))))
+
+(if (not (defined? 'inf?))
+    (define-public (inf? x) (= (/ 1.0 x) 0.0)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; intervals
+
 (define-public (interval-length x)
   "Length of the number-pair X, when an interval"
   (max 0 (- (cdr x) (car x))))
 
 (define-public interval-start car)
+(define-public (ordered-cons a b)
+  (cons (min a b)
+       (max a b)))
+
 (define-public interval-end cdr)
 
+(define-public (interval-index interval dir)
+  "Interpolate INTERVAL between between left (DIR=-1) and right (DIR=+1)"
+  
+  (* (+  (interval-start interval) (interval-end interval)
+        (* dir (- (interval-end interval) (interval-start interval))))
+     0.5))
+
+(define-public (interval-center x)
+  "Center the number-pair X, when an interval"
+  (if (interval-empty? x)
+      0.0
+      (/ (+ (car x) (cdr x)) 2)))
+
+(define-public interval-start car)
+(define-public interval-end cdr)
+(define-public (interval-translate iv amount)
+  (cons (+ amount (car iv))
+       (+ amount (cdr iv))))
+
 (define (other-axis a)
   (remainder (+ a 1) 2))
 
@@ -330,6 +379,17 @@ found."
    (cons (min (car i1) (car i2))
         (max (cdr i1) (cdr i2))))
 
+(define-public (interval-sane? i)
+  (not (or  (nan? (car i))
+           (inf? (car i))
+           (nan? (cdr i))
+           (inf? (cdr i)))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+
+
 (define-public (write-me message x)
   "Return X.  Display MESSAGE and write X.  Handy for debugging,
 possibly turned off."
@@ -364,11 +424,11 @@ possibly turned off."
 (define-public (string-regexp-substitute a b str)
   (regexp-substitute/global #f a str 'pre b 'post)) 
 
-
 (define (regexp-split str regex)
   (define matches '())
   (define end-of-prev-match 0)
   (define (notice match)
+
     (set! matches (cons (substring (match:string match)
                                   end-of-prev-match
                                   (match:start match))
@@ -447,7 +507,7 @@ possibly turned off."
    (string-append
     input-file-name ": 0: " (_ "warning: ")
    (format #f
-          (_ "no \\version statement found,  add~afor future compatibility")
+          (_ "no \\version statement found, please add~afor future compatibility")
           (format #f "\n\n\\version ~s\n\n" (lilypond-version))))))
 
 (define-public (old-relative-not-used-message input-file-name)