release: 1.5.19

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index a0bfc1dec21bc0188e950e0ab7b5e4657c34790c..c251e8fa2ee650b19532e6ab114022e9022f703c 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -54,7 +54,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)
@@ -111,17 +113,24 @@
 (map (lambda (x) (eval-string (ly-gulp-file x)))
      '("output-lib.scm"
        "tex.scm"
-       "ps.scm"
+       "ps.scm" "sketch.scm"
        "pdf.scm"
        "pdftex.scm"
        "ascii-script.scm"
        ))
 
+(define ctor list)
+
+
+(define (ly-load x) (eval-string (ly-gulp-file x)))
+
 (if (not standalone)
-    (map (lambda (x) (eval-string (ly-gulp-file x)))
+    (map ly-load
+                                       ; load-from-path
         '("c++.scm"
           "grob-property-description.scm"
           "translator-property-description.scm"
+          "context-description.scm"
           "interface-description.scm"
           "beam.scm"
           "clef.scm"
@@ -140,3 +149,4 @@
           )))
 
 
+