release: 1.5.23

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 352dc965412ffba4b67bfe2befb9c7fc04e9f2f5..5f10a15e7c704fa54d1903f59104cfd5ddd80939 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -5,7 +5,7 @@
 ;;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-;;; Library funtions
+;;; Library functions
 
 (use-modules (ice-9 regex))
 
@@ -13,6 +13,9 @@
 
 ;;; General settings
 
+
+
+
 (debug-enable 'backtrace)
 
 
@@ -54,7 +57,9 @@
 ;;; Un-assorted stuff
 
 ;; URG guile-1.4/1.4.x compatibility
-(define (ly-eval x) (eval2 x #f))
+(if (not (defined? 'primitive-eval))
+    (define (primitive-eval form)
+      (eval2 form #f)))
 
 (define (sign x)
   (if (= x 0)
@@ -81,6 +86,14 @@
            (cons (car list)  rest)
            rest))))
 
+(define (filter-out-list pred? list)
+  "return that part of LIST for which PRED is true."
+  (if (null? list) '()
+      (let* ((rest  (filter-list pred? (cdr list))))
+       (if (not (pred?  (car list)))
+           (cons (car list)  rest)
+           rest))))
+
 (define (uniqued-alist  alist acc)
   (if (null? alist) acc
       (if (assoc (caar alist) acc)
@@ -100,24 +113,58 @@
            (symbol->string (car y))))
 
 
-(map (lambda (x) (eval-string (ly-gulp-file x)))
-     '("output-lib.scm"
-       "tex.scm"
-       "ps.scm"
-       "ascii-script.scm"
-       ))
+(define (ly-load x) (eval-string (ly-gulp-file x)))
+
+(ly-load "output-lib.scm")
+
+
+
+(use-modules (scm tex)
+            (scm ps)
+            (scm pysk)
+            (scm ascii-script)
+            (scm sketch)
+            )
+
+(define output-alist
+  `(
+    ("tex" . ,tex-output-expression)
+    ("ps" . ,ps-output-expression)
+    ("scm" . ,write)
+    ("as" . ,as-output-expression)
+    ("pysk" . ,pysk-output-expression)
+    ("sketch" . ,sketch-output-expression)
+))
+
+
+(define (find-dumper format )
+  (let*
+      ((d (assoc format output-alist)))
+    
+    (if (pair?  d)
+               (cdr d)
+            scm-output-expression)
+           ))
+
 
 (if (not standalone)
-    (map (lambda (x) (eval-string (ly-gulp-file x)))
-        '("c++.scm"
+    (map ly-load
+                                       ; load-from-path
+        '("output-lib.scm"
+          "sketch.scm"
+          "pdf.scm"
+          "pdftex.scm"
+          "c++.scm"
           "grob-property-description.scm"
           "translator-property-description.scm"
+          "context-description.scm"
           "interface-description.scm"
           "beam.scm"
           "clef.scm"
           "slur.scm"
           "font.scm"
           "music-functions.scm"
+          "music-property-description.scm"
           "auto-beam.scm"
           "generic-property.scm"
           "basic-properties.scm"
@@ -129,3 +176,5 @@
           )))
 
 
+
+1