autochange wierdness

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index df53f375c2624db990605c35e62f9f0ba3463e21..7506323a653a25b222a997e058da32f777062f7e 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -13,7 +13,10 @@
 
 ;;; General settings
 
-(debug-enable 'backtrace)
+
+
+
+;(debug-enable 'backtrace)
 
 
 (define point-and-click #f)
@@ -60,7 +63,7 @@
 
 (define (sign x)
   (if (= x 0)
-      1
+      0
       (if (< x 0) -1 1)))
 
 (define (write-me n x)
@@ -110,26 +113,66 @@
            (symbol->string (car y))))
 
 
-(map (lambda (x) (eval-string (ly-gulp-file x)))
-     '("output-lib.scm"
-       "tex.scm"
-       "ps.scm"
-       "pdf.scm"
-       "pdftex.scm"
-       "ascii-script.scm"
-       ))
+(define (ly-load x)
+  (let*
+      (
+       (fn (%search-load-path x))
+       )
+    (if (ly-verbose)
+       (format (current-error-port) "[~A]" fn))
+    (primitive-load fn)
+
+    ))
+
+
+
 
-(define ctor list)
+(use-modules (scm tex)
+            (scm ps)
+            (scm pysk)
+            (scm ascii-script)
+            (scm sketch)
+            (scm pdftex)
+            )
 
+(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)
+    ("pdftex" . ,pdftex-output-expression)
+))
 
-(define (ly-load x) (eval-string (ly-gulp-file x)))
+
+(define (find-dumper format )
+  (let*
+      ((d (assoc format output-alist)))
+    
+    (if (pair?  d)
+               (cdr d)
+            scm-output-expression)
+           ))
+
+
+(define X 0)
+(define Y 1)
+(define LEFT -1)
+(define RIGHT 1)
+(define UP 1)
+(define DOWN -1)
+(define CENTER 0)
 
 (if (not standalone)
     (map ly-load
                                        ; load-from-path
-        '("c++.scm"
+        '("output-lib.scm"
+          "c++.scm"
+          "molecule.scm"
+          "bass-figure.scm"
           "grob-property-description.scm"
-          "translator-property-description.scm"
           "context-description.scm"
           "interface-description.scm"
           "beam.scm"
@@ -139,14 +182,12 @@
           "music-functions.scm"
           "music-property-description.scm"
           "auto-beam.scm"
-          "generic-property.scm"
           "basic-properties.scm"
           "chord-name.scm"
           "grob-description.scm"
+          "translator-property-description.scm"
           "script.scm"
           "drums.scm"
           "midi.scm"
           )))
 
-
-