X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=8922fef0eaed20729c3dca70db49e167bf9cdd88;hb=46340a068e743b3b35175c80b811c0b3860512ea;hp=04c217ed4689bd1cfc67a62ff2250893583cc655;hpb=e520d35df0268554fabe100fcdbe26946c693031;p=lilypond.git

diff --git a/scm/lily.scm b/scm/lily.scm
index 04c217ed46..8922fef0ea 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -5,7 +5,7 @@
 ;;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-;;; Library funtions
+;;; Library functions
 
 (use-modules (ice-9 regex))
 
@@ -13,6 +13,9 @@
 
 ;;; General settings
 
+
+
+
 (debug-enable 'backtrace)
 
 
@@ -23,7 +26,7 @@
 (define (line-column-location line col file)
   "Print an input location, including column number ."
   (string-append (number->string line) ":"
-		 (number->string col) " " file " ")
+		 (number->string col) " " file)
   )
 
 (define (line-location line col file)
@@ -31,6 +34,9 @@
   (string-append (number->string line) " " file)
   )
 
+;; cpp hack to get useful error message
+(define ifdef "First run this through cpp.")
+(define ifndef "First run this through cpp.")
   
 (define default-script-alist '())
 (define font-name-alist  '())
@@ -50,52 +56,127 @@
 
 ;;; Un-assorted stuff
 
-;; URG guile-1.3/1.4 compatibility
-(define (ly-eval x) (eval2 x #f))
+;; URG guile-1.4/1.4.x compatibility
+(if (not (defined? 'primitive-eval))
+    (define (primitive-eval form)
+      (eval2 form #f)))
 
 (define (sign x)
   (if (= x 0)
       1
       (if (< x 0) -1 1)))
 
+(define (write-me n x)
+  (display n)
+  (write x)
+  (newline)
+  x)
+
+(define (empty? x)
+  (equal? x '()))
+
+(define (!= l r)
+  (not (= l r)))
+
+(define (filter-list pred? list)
+  "return that part of LIST for which PRED is true."
+  (if (null? list) '()
+      (let* ((rest  (filter-list pred? (cdr list))))
+	(if (pred?  (car list))
+	    (cons (car list)  rest)
+	    rest))))
+
+(define (filter-out-list pred? list)
+  "return that part of LIST for which PRED is true."
+  (if (null? list) '()
+      (let* ((rest  (filter-list pred? (cdr list))))
+	(if (not (pred?  (car list)))
+	    (cons (car list)  rest)
+	    rest))))
+
+(define (uniqued-alist  alist acc)
+  (if (null? alist) acc
+      (if (assoc (caar alist) acc)
+	  (uniqued-alist (cdr alist) acc)
+	  (uniqued-alist (cdr alist) (cons (car alist) acc)))))
+
+(define (uniq-list list)
+  (if (null? list) '()
+      (if (null? (cdr list))
+	  list
+	  (if (equal? (car list) (cadr list))
+	      (uniq-list (cdr list))
+	      (cons (car list) (uniq-list (cdr list)))))))
+
+(define (alist<? x y)
+  (string<? (symbol->string (car x))
+	    (symbol->string (car y))))
 
-;;(define major-scale
-;;  '(
-;;    (0 . 0)
-;;    (1 . 0)
-;;    (2 . 0)
-;;    (3 . 0)
-;;    (4 . 0)
-;;    (5 . 0)
-;;    (6 . 0)
-;;   ))
 
+(define (ly-load x) (eval-string (ly-gulp-file x)))
+
+(ly-load "output-lib.scm")
+
+
+
+(use-modules (scm tex)
+	     (scm ps)
+	     (scm pysk)
+	     (scm ascii-script)
+	     (scm sketch)
+	     )
+
+(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)
+))
+
+
+
+
+(define (find-dumper format )
+  (let*
+      ((d (assoc format output-alist)))
+    
+    (if (pair?  d)
+		(cdr d)
+	     scm-output-expression)
+	    ))
 
-(map (lambda (x) (eval-string (ly-gulp-file x)))
-     '("output-lib.scm"
-       "tex.scm"
-       "ps.scm"
-       "ascii-script.scm"
-       ))
 
 (if (not standalone)
-    (map (lambda (x) (eval-string (ly-gulp-file x)))
-	 '("c++.scm"
+    (map ly-load
+					; load-from-path
+	 '("output-lib.scm"
+	   "sketch.scm"
+	   "pdf.scm"
+	   "pdftex.scm"
+	   "ascii-script.scm"
+      	   "c++.scm"
 	   "grob-property-description.scm"
 	   "translator-property-description.scm"
+	   "context-description.scm"
 	   "interface-description.scm"
 	   "beam.scm"
 	   "clef.scm"
 	   "slur.scm"
 	   "font.scm"
 	   "music-functions.scm"
+	   "music-property-description.scm"
 	   "auto-beam.scm"
 	   "generic-property.scm"
 	   "basic-properties.scm"
 	   "chord-name.scm"
 	   "grob-description.scm"
 	   "script.scm"
+	   "drums.scm"
 	   "midi.scm"
 	   )))
 
 
+