autochange wierdness

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index ba77f59747049703d3df0005ad702612a74c07df..7506323a653a25b222a997e058da32f777062f7e 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -16,7 +16,7 @@
 
 
 
-(debug-enable 'backtrace)
+;(debug-enable 'backtrace)
 
 
 (define point-and-click #f)
@@ -113,9 +113,17 @@
            (symbol->string (car y))))
 
 
-(define (ly-load x) (eval-string (ly-gulp-file x)))
+(define (ly-load x)
+  (let*
+      (
+       (fn (%search-load-path x))
+       )
+    (if (ly-verbose)
+       (format (current-error-port) "[~A]" fn))
+    (primitive-load fn)
+
+    ))
 
-(ly-load "output-lib.scm")
 
 
 
@@ -124,6 +132,7 @@
             (scm pysk)
             (scm ascii-script)
             (scm sketch)
+            (scm pdftex)
             )
 
 (define output-alist
@@ -134,6 +143,7 @@
     ("as" . ,as-output-expression)
     ("pysk" . ,pysk-output-expression)
     ("sketch" . ,sketch-output-expression)
+    ("pdftex" . ,pdftex-output-expression)
 ))
 
 
@@ -159,9 +169,8 @@
     (map ly-load
                                        ; load-from-path
         '("output-lib.scm"
-          "pdf.scm"
-          "pdftex.scm"
           "c++.scm"
+          "molecule.scm"
           "bass-figure.scm"
           "grob-property-description.scm"
           "context-description.scm"
@@ -173,7 +182,6 @@
           "music-functions.scm"
           "music-property-description.scm"
           "auto-beam.scm"
-          "generic-property.scm"
           "basic-properties.scm"
           "chord-name.scm"
           "grob-description.scm"