* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 8922fef0eaed20729c3dca70db49e167bf9cdd88..795536e68f48ea9679a8a8de331e109e93735035 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -11,12 +11,14 @@
 
 ;;(write standalone (current-error-port))
 
-;;; General settings
-
 
+;;; General settings
+;; debugging evaluator is slower.
 
+;(debug-enable 'debug)
+;(debug-enable 'backtrace)
+;(read-enable 'positions)
 
-(debug-enable 'backtrace)
 
 
 (define point-and-click #f)
@@ -63,7 +65,7 @@
 
 (define (sign x)
   (if (= x 0)
-      1
+      0
       (if (< x 0) -1 1)))
 
 (define (write-me n x)
@@ -112,11 +114,11 @@
   (string<? (symbol->string (car x))
            (symbol->string (car y))))
 
-
-(define (ly-load x) (eval-string (ly-gulp-file x)))
-
-(ly-load "output-lib.scm")
-
+(define (ly-load x)
+  (let* ((fn (%search-load-path x)))
+    (if (ly-verbose)
+       (format (current-error-port) "[~A]" fn))
+    (primitive-load fn)))
 
 
 (use-modules (scm tex)
@@ -124,42 +126,55 @@
             (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)
-))
-
-
+    ("tex" . ("TeX output. The default output form." ,tex-output-expression))
+    ("ps" . ("Direct postscript. Requires setting GS_LIB and GS_FONTPATH" ,ps-output-expression))
+    ("scm" . ("Scheme dump: debug scheme molecule expressions" ,write))
+    ("as" . ("Asci-script. Postprocess with as2txt to get ascii art"  ,as-output-expression))
+    ("sketch" . ("Bare bones Sketch output. Requires sketch 0.7" ,sketch-output-expression))
+    ("pdftex" . ("PDFTeX output. Was last seen nonfunctioning." ,pdftex-output-expression))
+    ))
+
+(define (pad-string-to str wid)
+  (string-append str (make-string (max (- wid (string-length str)) 0) #\ ))
+  )
 
+(define (document-format-dumpers)
+  (map
+   (lambda (x)
+     (display (string-append  (pad-string-to 5 (car x)) (cadr x) "\n"))
+     output-alist)
+   ))
 
 (define (find-dumper format )
   (let*
       ((d (assoc format output-alist)))
     
-    (if (pair?  d)
-               (cdr d)
-            scm-output-expression)
-           ))
-
+    (if (pair? d)
+       (caddr d)
+       (scm-error "Could not find dumper for format ~s" format))
+    ))
+
+(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
         '("output-lib.scm"
-          "sketch.scm"
-          "pdf.scm"
-          "pdftex.scm"
-          "ascii-script.scm"
           "c++.scm"
+          "molecule.scm"
+          "bass-figure.scm"
           "grob-property-description.scm"
-          "translator-property-description.scm"
           "context-description.scm"
           "interface-description.scm"
           "beam.scm"
@@ -169,14 +184,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"
           )))
 
-
-