Merge ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master-hanwen

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

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 8d12c350d796505eb9d9927bd7e6dcc7fbad1f4d..6e30cf6ae541780e331d2e5602c1d01379665dbe 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -4,7 +4,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 (define-public X 0)
@@ -228,7 +228,34 @@ found."
     m))
 
 ;;;;;;;;;;;;;;;;
-; list
+;; list
+
+
+(define-public (count-list lst)
+  "Given lst (E1 E2 .. ) return ((E1 . 1) (E2 . 2) ... )  "
+  (define (helper l acc count)
+    (if (pair? l)
+       (helper (cdr l) (cons (cons (car l) count) acc) (1+ count))
+       acc))
+
+
+  (reverse (helper lst '() 1)))
+  
+(define-public (list-join lst intermediate)
+  "put INTERMEDIATE  between all elts of LST."
+
+  (fold-right
+   (lambda (elem prev)
+           (if (pair? prev)
+               (cons  elem (cons intermediate prev))
+               (list elem)))
+         '() lst))
+
+(define-public (filtered-map proc lst)
+  (filter
+   (lambda (x) x)
+   (map proc lst)))
+
 
 (define (flatten-list lst)
   "Unnest LST" 
@@ -310,6 +337,10 @@ 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
@@ -320,10 +351,12 @@ found."
 ;; numbers
 
 (if (not (defined? 'nan?)) ;; guile 1.6 compat
-    (define-public (nan? x) #f))
+    (define-public (nan? x) (not (or (< 0.0 x)
+                                    (> 0.0 x)
+                                    (= 0.0 x)))))
 
 (if (not (defined? 'inf?))
-    (define-public (inf? x) #f))
+    (define-public (inf? x) (= (/ 1.0 x) 0.0)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; intervals
@@ -333,8 +366,19 @@ found."
   (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)
@@ -366,12 +410,43 @@ found."
   (not (or  (nan? (car i))
            (inf? (car i))
            (nan? (cdr i))
-           (inf? (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."
@@ -410,6 +485,7 @@ possibly turned off."
   (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))
@@ -432,6 +508,8 @@ 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)))