* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 7506323a653a25b222a997e058da32f777062f7e..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)
+
 
 
 (define point-and-click #f)
@@ -112,19 +114,11 @@
   (string<? (symbol->string (car x))
            (symbol->string (car y))))
 
-
 (define (ly-load x)
-  (let*
-      (
-       (fn (%search-load-path x))
-       )
+  (let* ((fn (%search-load-path x)))
     (if (ly-verbose)
        (format (current-error-port) "[~A]" fn))
-    (primitive-load fn)
-
-    ))
-
-
+    (primitive-load fn)))
 
 
 (use-modules (scm tex)
@@ -137,25 +131,33 @@
 
 (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)
-))
+    ("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)