X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily-library.scm;h=492e38d5ecfc0cf99e56897f95965aca95e6c4f4;hb=272196a953f0b39de8da914f47e9daa8e93925b0;hp=77938bd9b4901f601f7b3d03fa8cb8bc3dbe63a0;hpb=57be7394ffa2e7d7ba6d60548dba563f3409d472;p=lilypond.git

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 77938bd9b4..492e38d5ec 100644
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -1,9 +1,10 @@
+;;;;
 ;;;; lily-library.scm -- utilities
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 (define-public X 0)
@@ -43,34 +44,82 @@
 
 ;; parser stuff.
 (define-public (print-music-as-book parser music)
-  (let* ((head (ly:parser-lookup parser '$globalheader))
-	 (book (ly:make-book (ly:parser-lookup parser $defaultpaper)
-			     head score)))
-    (ly:parser-print-book parser book)))
+  (let* ((head (ly:parser-lookup parser '$defaultheader))
+	 (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 '$globalheader))
-	 (book (ly:make-book (ly:parser-lookup parser $defaultpaper)
+  (let* ((head (ly:parser-lookup parser '$defaultheader))
+	 (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 '$globalheader))
-	 (book (ly:make-book (ly:parser-lookup parser $defaultpaper)
+  (let* ((head (ly:parser-lookup parser '$defaultheader))
+	 (book (ly:make-book (ly:parser-lookup parser '$defaultpaper)
 			     head score)))
     (ly:parser-print-score parser book)))
 		
 (define-public (collect-scores-for-book parser score)
-  (ly:parser-define
+  (ly:parser-define!
    parser 'toplevel-scores
    (cons score (ly:parser-lookup parser 'toplevel-scores))))
-    
-(define-public (collect-music-for-book parser music)
-  (collect-scores-for-book parser (ly:music-scorify music parser)))
 
+
+(define-public (scorify-music music parser)
   
+  (for-each (lambda (func)
+	      (set! music (func music parser)))
+	    toplevel-music-functions)
+
+  (ly:make-score music))
+
+(define-public (collect-music-for-book parser music)
+  ;; 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)
+  (let*
+      ((paper (ly:parser-lookup parser '$defaultpaper))
+       (layout (ly:parser-lookup parser '$defaultlayout))
+       (count (ly:parser-lookup parser 'output-count))
+       (base (ly:parser-output-name parser)))
+
+    (if (not (integer? count))
+	(set! count 0))
+
+    (if (> count 0)
+	(set! base (format #f "~a-~a" base count)))
+
+    (ly:parser-define! parser 'output-count (1+ count))
+    (ly:book-process book paper layout base)
+    ))
+
+(define-public (print-score-with-defaults parser score)
+  (let*
+      ((paper (ly:parser-lookup parser '$defaultpaper))
+       (layout (ly:parser-lookup parser '$defaultlayout))
+       (header (ly:parser-lookup parser '$defaultheader))
+       (count (ly:parser-lookup parser 'output-count))
+       (base (ly:parser-output-name parser)))
+
+    (if (not (integer? count))
+	(set! count 0))
+
+    (if (> count 0)
+	(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
+;; alist
 (define-public assoc-get ly:assoc-get)
 
 (define-public (uniqued-alist alist acc)
@@ -119,7 +168,28 @@ found."
       '()
       (cons (cons (func (caar list)) (cdar list))
 	    (map-alist-keys func (cdr list)))))
- 
+
+(define-public (first-member members lst)
+  "Return first successful MEMBER of member from MEMBERS in LST."
+  (if (null? members)
+      #f
+      (let ((m (member (car members) lst)))
+	(if m m (first-member (cdr members) lst)))))
+
+(define-public (first-assoc keys lst)
+  "Return first successful ASSOC of key from KEYS in LST."
+  (if (null? keys)
+      #f
+      (let ((k (assoc (car keys) lst)))
+	(if k k (first-assoc (cdr keys) lst)))))
+
+(define-public (flatten-alist alist)
+  (if (null? alist)
+      '()
+      (cons (caar alist)
+	    (cons (cdar alist)
+		  (flatten-alist (cdr alist))))))
+
 ;;;;;;;;;;;;;;;;
 ;; vector
 (define-public (vector-for-each proc vec)
@@ -134,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))))
@@ -235,18 +310,59 @@ 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))
@@ -255,10 +371,55 @@ found."
    (cons (- (car iv) amount)
          (+ (cdr iv) amount)))
 
+
+(define-public (interval-empty? iv)
+   (> (car iv) (cdr iv)))
+
 (define-public (interval-union i1 i2)
    (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))
+	    (> (car i) (cdr i)))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+
+
+(define-public (string-encode-integer i)
+  (cond
+   ((= i  0) "o")
+   ((< i 0)   (string-append "n" (string-encode-integer (- i))))
+   (else (string-append
+	  (make-string 1 (integer->char (+ 65 (modulo i 26))))
+	  (string-encode-integer (quotient i 26))))))
+
+(define-public (ly:numbers->string lst)
+  (string-join (map ly:number->string lst) " "))
+
+(define (number->octal-string x)
+  (let* ((n (inexact->exact x))
+         (n64 (quotient n 64))
+         (n8 (quotient (- n (* n64 64)) 8)))
+    (string-append
+     (number->string n64)
+     (number->string n8)
+     (number->string (remainder (- n (+ (* n64 64) (* n8 8))) 8)))))
+
+(define-public (ly:inexact->string x radix)
+  (let ((n (inexact->exact x)))
+    (number->string n radix)))
+
+(define-public (ly:number-pair->string c)
+  (string-append (ly:number->string (car c)) " "
+		 (ly:number->string (cdr c))))
+
+
 (define-public (write-me message x)
   "Return X.  Display MESSAGE and write X.  Handy for debugging,
 possibly turned off."
@@ -290,10 +451,29 @@ possibly turned off."
 	(cons x  (cons between y))))
   (fold-right conc #f lst))
 
-
 (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))
+			matches))
+    (set! end-of-prev-match (match:end match)))
+
+  (regexp-substitute/global #f regex str notice 'post)
+
+  (if (< end-of-prev-match (string-length str))
+      (set!
+       matches
+       (cons (substring str end-of-prev-match (string-length str)) matches)))
+
+   (reverse matches))
+
 ;;;;;;;;;;;;;;;;
 ; other
 (define (sign x)
@@ -301,9 +481,25 @@ possibly turned off."
       0
       (if (< x 0) -1 1)))
 
+(define-public (car< a b) (< (car a) (car b)))
+
+
 (define-public (symbol<? lst r)
   (string<? (symbol->string lst) (symbol->string r)))
 
+(define-public (symbol-key<? lst r)
+  (string<? (symbol->string (car lst)) (symbol->string (car r))))
+
+;;
+;; don't confuse users with #<procedure .. > syntax. 
+;; 
+(define-public (scm->string val)
+  (if (and (procedure? val) (symbol? (procedure-name val)))
+      (symbol->string (procedure-name val))
+      (string-append
+       (if (self-evaluating? val) "" "'")
+       (call-with-output-string (lambda (port) (display val port))))))
+
 (define-public (!= lst r)
   (not (= lst r)))
 
@@ -339,8 +535,16 @@ possibly turned off."
     (debugf "design:~S\n" designsize)
     scaling))
 
-(define-public (version-not-seen-message)
-  (ly:warning
+(define-public (version-not-seen-message input-file-name)
+  (ly:message
+   (string-append
+    input-file-name ": 0: " (_ "warning: ")
    (format #f
-	   (_ "No \\version statement found.  Add~afor future compatibility.")
-	   (format #f "\n\n\\version ~s\n\n" (lilypond-version)))))
+	   (_ "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)
+  (ly:message
+   (string-append
+    input-file-name ": 0: " (_ "warning: ")
+    (_ "old relative compatibility not used"))))