X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=ba77f59747049703d3df0005ad702612a74c07df;hb=b02bb98ffea2c376ba67eb049b8ba6b04d76e084;hp=8dad0147d05c99ea509c9da7babf8d7fc8c656c3;hpb=7776d4901caa57e1d0f3ab7cf01348b930a6dbee;p=lilypond.git

diff --git a/scm/lily.scm b/scm/lily.scm
index 8dad0147d0..ba77f59747 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -1,770 +1,185 @@
-; lily.scm -- implement Scheme output routines for TeX and PostScript
-;
-;  source file of the GNU LilyPond music typesetter
-; 
-; (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; lily.scm -- implement Scheme output routines for TeX and PostScript
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-;
-; This file contains various routines in Scheme that are easier to 
-; do here than in C++.  At present it is an unorganised mess. Sorry. 
-;
-
-; We should repartition the entire scm side of lily in a
-; more sane way, using namesspaces/modules?
-
-(debug-enable 'backtrace)
-
-;;; library funtions
+;;; Library functions
 
 (use-modules (ice-9 regex))
 
-(define (number-pair?  x)
-  (and (pair? x) (number? (car x)) (number? (cdr x))))
-
-(define (object-type obj)
-  (cond
-   ((dir? obj) "direction")
-   ((number-pair? obj) "pair of numbers")
-   ((ly-input-location? obj) "input location")   
-   ((ly-element? obj) "graphic element")
-   ((pair? obj) "pair")
-   ((integer? obj) "integer")
-   ((list? obj) "list")
-   ((symbol? obj) "symbol")
-   ((string? obj) "string")
-   ((boolean? obj) "boolean")
-   ((moment? obj) "moment")
-   ((number? obj) "number")
-   ((char? obj) "char")
-   ((input-port? obj) "input port")
-   ((output-port? obj) "output port")   
-   ((vector? obj) "vector")
-   ((procedure? obj) "procedure") 
-   (else "unknown type")
-  ))
-
-
-(define (type-name  predicate)
-  (cond
-   ((eq? predicate dir?) "direction")
-   ((eq? predicate number-pair?) "pair of numbers")
-   ((eq? predicate ly-input-location?) "input location")   
-   ((eq? predicate ly-element?) "graphic element")
-   ((eq? predicate pair?) "pair")
-   ((eq? predicate integer?) "integer")
-   ((eq? predicate list?) "list")
-   ((eq? predicate symbol?) "symbol")
-   ((eq? predicate string?) "string")
-   ((eq? predicate boolean?) "boolean")
-   ((eq? predicate moment?) "moment")
-   ((eq? predicate number?) "number")
-   ((eq? predicate char?) "char")
-   ((eq? predicate input-port?) "input port")
-   ((eq? predicate output-port?) "output port")   
-   ((eq? predicate vector?) "vector")
-   ((eq? predicate procedure?) "procedure") 
-   (else "unknown type")
-  ))
-
-
-;; The regex module may not be available, or may be broken.
-(define use-regex
-  (let ((os (string-downcase (vector-ref (uname) 0))))
-    (not (equal? "cygwin" (substring os 0 (min 6 (string-length os)))))))
-
-;; If you have trouble with regex, define #f
-(define use-regex #t)
-;;(define use-regex #f)
-
-;; do nothing in .scm output
-(define (comment s) "")
-
-;; URG guile-1.3/1.4 compatibility
-(define (ly-eval x) (eval2 x #f))
-
-(define (comment s) "")
-
-(define (mm-to-pt x)
-  (* (/ 72.27 25.40) x)
-  )
-
-(define (cons-map f x)
-  (cons (f (car x)) (f (cdr x))))
-
-(define (reduce operator list)
-      (if (null? (cdr list)) (car list)
-	  (operator (car list) (reduce operator (cdr list)))
-	  )
-      )
+;;(write standalone (current-error-port))
 
+;;; General settings
 
-(define (numbers->string l)
-  (apply string-append (map ly-number->string l)))
 
-; (define (chop-decimal x) (if (< (abs x) 0.001) 0.0 x))
 
-(define (number->octal-string x)
-  (let* ((n (inexact->exact x))
-         (n64 (quotient n 64))
-         (n8 (quotient (- n (* n64 64)) 8)))
-    (string-append
-     (number->string n64)
-     (number->string n8)
-     (number->string (remainder (- n (+ (* n64 64) (* n8 8))) 8)))))
 
-(define (inexact->string x radix)
-  (let ((n (inexact->exact x)))
-    (number->string n radix)))
-
-
-(define (control->string c)
-  (string-append (number->string (car c)) " "
-		 (number->string (cdr c)) " "))
-
-(define (font i)
-  (string-append
-   "font"
-   (make-string 1 (integer->char (+ (char->integer #\A) i)))
-   ))
+(debug-enable 'backtrace)
 
-(define (scm-scm action-name)
-  1)
 
+(define point-and-click #f)
 (define security-paranoia #f)
+(define midi-debug #f)
 
-
-;; silly, use alist? 
-(define (find-notehead-symbol duration style)
-  (case style
-   ((cross) "2cross")
-   ((harmonic) "0mensural")
-   ((baroque) 
-    (string-append (number->string duration)
-		   (if (< duration 0) "mensural" "")))
-   ((default) (number->string duration))
-   (else
-    (string-append (number->string duration) (symbol->string style))))
+(define (line-column-location line col file)
+  "Print an input location, including column number ."
+  (string-append (number->string line) ":"
+		 (number->string col) " " file)
   )
 
-
-;;;;;;;; TeX
-
-(define (string-encode-integer i)
-  (cond
-   ((= i  0) "o")
-   ((< i 0)   (string-append "n" (string-encode-integer (- i))))
-   (else (string-append
-	  (make-string 1 (integer->char (+ 65 (modulo i 26))))
-	  (string-encode-integer (quotient i 26))
-	  ))
-   )
+(define (line-location line col file)
+  "Print an input location, without column number ."
+  (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  '())
-(define (tex-encoded-fontswitch name-mag)
-  (let* (
-	 (iname-mag (car name-mag))
-	 (ename-mag (cdr name-mag))
-	 )
-    (cons iname-mag
-	  (cons ename-mag
-		(string-append  "magfont"
-			  (string-encode-integer
-			   (hashq (car ename-mag) 1000000))
-			  "m"
-			  (string-encode-integer
-			   (inexact->exact (* 1000 (cdr ename-mag))))
-
-			  )
-		)
-    )))
-
-(define (define-fonts internal-external-name-mag-pairs)
-  (set! font-name-alist (map tex-encoded-fontswitch
-			     internal-external-name-mag-pairs))
-  (apply string-append
-	 (map (lambda (x)
-		(font-load-command (car x) (cdr x)))
-	      (map cdr font-name-alist)  
-
-  )))
-
-(define (fontify name-mag-pair exp)
-  (string-append (select-font name-mag-pair)
-		 exp)
-  )
 
-;;;;;;;;;;;;;;;;;;;;
-
-
-; Make a function that checks score element for being of a specific type. 
-(define (make-type-checker symbol)
-  (lambda (elt)
-    ;;(display  symbol)
-    ;;(eq? #t (ly-get-elt-property elt symbol))
-    (not (eq? #f (memq symbol (ly-get-elt-property elt 'interfaces))))
-    ))
-
-;;;;;;;;;;;;;;;;;;; TeX output
-(define (tex-scm action-name)
-  (define (unknown) 
-    "%\n\\unknown%\n")
-
-
-  (define (select-font name-mag-pair)
-    (let*
-	(
-	 (c (assoc name-mag-pair font-name-alist))
-	 )
-
-      (if (eq? c #f)
-	  (begin
-	    (display "FAILED\n")
-	    (display (object-type (car name-mag-pair)))
-	    (display (object-type (caaar font-name-alist)))
-
-	    (ly-warn (string-append
-		      "Programming error: No such font known "
-		      (car name-mag-pair) " "
-		      (number->string (cdr name-mag-pair))
-		      ))
-	    "") ; issue no command
-	  (string-append "\\" (cddr c)))
-      
-      
-      ))
-  
-  (define (beam width slope thick)
-    (embedded-ps ((ps-scm 'beam) width slope thick)))
-
-  (define (bracket arch_angle arch_width arch_height width height arch_thick thick)
-    (embedded-ps ((ps-scm 'bracket) arch_angle arch_width arch_height width height arch_thick thick)))
-
-  (define (dashed-slur thick dash l)
-    (embedded-ps ((ps-scm 'dashed-slur)  thick dash l)))
-
-  (define (crescendo thick w h cont)
-    (embedded-ps ((ps-scm 'crescendo) thick w h cont)))
-
-  (define (char i)
-    (string-append "\\char" (inexact->string i 10) " "))
-  
-  (define (dashed-line thick on off dx dy)
-    (embedded-ps ((ps-scm 'dashed-line) thick on off dx dy)))
-
-  (define (decrescendo thick w h cont)
-    (embedded-ps ((ps-scm 'decrescendo) thick w h cont)))
-
-  (define (font-load-command name-mag command)
-    (string-append
-     "\\font\\" command "="
-     (car name-mag)
-     " scaled "
-     (number->string (inexact->exact (* 1000  (cdr name-mag))))
-     "\n"))
+(if (not (defined? 'standalone))
+    (define standalone (not (defined? 'ly-gulp-file))))
 
-  (define (embedded-ps s)
-    (string-append "\\embeddedps{" s "}"))
+;; The regex module may not be available, or may be broken.
+(define use-regex
+  (let ((os (string-downcase (vector-ref (uname) 0))))
+    (not (equal? "cygwin" (substring os 0 (min 6 (string-length os)))))))
 
-  (define (comment s)
-    (string-append "% " s))
-  
-  (define (end-output) 
-	(begin
-; uncomment for some stats about lily memory	  
-;		(display (gc-stats))
-    (string-append "\n\\EndLilyPondOutput"
-		   ; Put GC stats here.
-		   )))
-  
-  (define (experimental-on)
-    "")
-
-  (define (font-switch i)
-    (string-append
-     "\\" (font i) "\n"))
-
-  (define (font-def i s)
-    (string-append
-     "\\font" (font-switch i) "=" s "\n"))
-
-  (define (header-end)
-    (string-append
-     "\\special{! "
-
-     ;; URG: ly-gulp-file: now we can't use scm output without Lily
-     (if use-regex
-	 ;; fixed in 1.3.4 for powerpc -- broken on Windows
-	 (regexp-substitute/global #f "\n"
-				   (ly-gulp-file "lily.ps") 'pre " %\n" 'post)
-	 (ly-gulp-file "lily.ps"))
-     "}"
-     "\\input lilyponddefs\\newdimen\\outputscale \\outputscale=\\mudelapaperoutputscale pt\\turnOnPostScript"))
-
-  (define (header creator generate) 
-    (string-append
-     "%created by: " creator generate "\n"))
-
-  (define (invoke-char s i)
-    (string-append 
-     "\n\\" s "{" (inexact->string i 10) "}" ))
-
-  (define (invoke-dim1 s d)
-    (string-append
-     "\n\\" s "{" (number->dim d) "}"))
-  (define (pt->sp x)
-    (* 65536 x))
-  
-  ;;
-  ;; need to do something to make this really safe.
-  ;;
-  (define (output-tex-string s)
-      (if security-paranoia
-	  (if use-regex
-	      (regexp-substitute/global #f "\\\\" s 'pre "$\\backslash$" 'post)
-	      (begin (display "warning: not paranoid") (newline) s))
-	  s))
-      
-  (define (lily-def key val)
-    (string-append
-     "\\def\\"
-     (if use-regex
-	 ;; fixed in 1.3.4 for powerpc -- broken on Windows
-	 (regexp-substitute/global #f "_"
-				   (output-tex-string key) 'pre "X" 'post)
-	 (output-tex-string key))
-     "{" (output-tex-string val) "}\n"))
-
-  (define (number->dim x)
-    (string-append 
-     (ly-number->string x) " \\outputscale "))
-
-  (define (placebox x y s) 
-    (string-append 
-     "\\placebox{"
-     (number->dim y) "}{" (number->dim x) "}{" s "}\n"))
-
-  (define (bezier-sandwich l thick)
-    (embedded-ps ((ps-scm 'bezier-sandwich) l thick)))
-
-  (define (start-line ht)
-      (string-append"\\vbox to " (number->dim ht) "{\\hbox{%\n"))
-
-  (define (stop-line) 
-    "}\\vss}\\interscoreline\n")
-  (define (stop-last-line)
-    "}\\vss}")
-  (define (filledbox breapth width depth height) 
-    (string-append 
-     "\\kern" (number->dim (- breapth))
-     "\\vrule width " (number->dim (+ breapth width))
-     "depth " (number->dim depth)
-     "height " (number->dim height) " "))
-
-  (define (text s)
-    (string-append "\\hbox{" (output-tex-string s) "}"))
-  
-  (define (tuplet ht gapx dx dy thick dir)
-    (embedded-ps ((ps-scm 'tuplet) ht gapx dx dy thick dir)))
-
-  (define (volta h w thick vert_start vert_end)
-    (embedded-ps ((ps-scm 'volta) h w thick vert_start vert_end)))
-
-  (define (define-origin file line col)
-    ; use this for column positions
-     (string-append "\\special{src:" (number->string line) ":"
-        (number->string col) " " file "}"
-	 ;; arg, the clueless take over the mailing list...
-;	 "\\special{-****-These-warnings-are-harmless-***}"
-;	 "\\special{-****-PLEASE-read-http://appel.lilypond.org/wiki/index.php3?PostProcessing-****}"
-	)
-
-     ; line numbers only:
-    ;(string-append "\\special{src:" (number->string line) " " file "}")
-)
-    ; no origin  info: return empty string
-    ; ""
-  ; no-origin not yet supported by Xdvi
-  (define (no-origin) "")
-  
-  ;; TeX
-  ;; The procedures listed below form the public interface of TeX-scm.
-  ;; (should merge the 2 lists)
-  (cond ((eq? action-name 'all-definitions)
-	 `(begin
-	    (define font-load-command ,font-load-command)
-	    (define beam ,beam)
-	    (define bezier-sandwich ,bezier-sandwich)
-	    (define bracket ,bracket)
-	    (define char ,char)
-	    (define crescendo ,crescendo)
-	    (define dashed-line ,dashed-line) 
-	    (define dashed-slur ,dashed-slur) 
-	    (define decrescendo ,decrescendo) 
-	    (define end-output ,end-output)
-	    (define experimental-on ,experimental-on)
-	    (define filledbox ,filledbox)
-	    (define font-def ,font-def)
-	    (define font-switch ,font-switch)
-	    (define header-end ,header-end)
-	    (define lily-def ,lily-def)
-	    (define header ,header) 
-	    (define invoke-char ,invoke-char) 
-	    (define invoke-dim1 ,invoke-dim1)
-	    (define placebox ,placebox)
-	    (define select-font ,select-font)
-	    (define start-line ,start-line)
-	    (define stop-line ,stop-line)
-	    (define stop-last-line ,stop-last-line)
-	    (define text ,text)
-	    (define tuplet ,tuplet)
-	    (define volta ,volta)
-	    (define define-origin ,define-origin)
-	    (define no-origin ,no-origin)
-	    ))
+;; If you have trouble with regex, define #f
+(define use-regex #t)
+;;(define use-regex #f)
 
-	((eq? action-name 'beam) beam)
-	((eq? action-name 'tuplet) tuplet)
-	((eq? action-name 'bracket) bracket)
-	((eq? action-name 'crescendo) crescendo)
-	((eq? action-name 'dashed-line) dashed-line) 
-	((eq? action-name 'dashed-slur) dashed-slur) 
-	((eq? action-name 'decrescendo) decrescendo) 
-	((eq? action-name 'end-output) end-output)
-	((eq? action-name 'experimental-on) experimental-on)
-	((eq? action-name 'font-def) font-def)
-	((eq? action-name 'font-switch) font-switch)
-	((eq? action-name 'header-end) header-end)
-	((eq? action-name 'lily-def) lily-def)
-	((eq? action-name 'header) header) 
-	((eq? action-name 'invoke-char) invoke-char) 
-	((eq? action-name 'invoke-dim1) invoke-dim1)
-	((eq? action-name 'placebox) placebox)
-	((eq? action-name 'bezier-sandwich) bezier-sandwich)
-	((eq? action-name 'start-line) start-line)
-	((eq? action-name 'stem) stem)
-	((eq? action-name 'stop-line) stop-line)
-	((eq? action-name 'stop-last-line) stop-last-line)
-	((eq? action-name 'volta) volta)
-	(else (error "unknown tag -- PS-TEX " action-name))
-	)
-  )
 
+;;; Un-assorted stuff
 
-;;;;;;;;;;;; PS
-(define (ps-scm action-name)
+;; URG guile-1.4/1.4.x compatibility
+(if (not (defined? 'primitive-eval))
+    (define (primitive-eval form)
+      (eval2 form #f)))
 
-  ;; alist containing fontname -> fontcommand assoc (both strings)
-  (define font-alist '())
-  (define font-count 0)
-  (define current-font "")
+(define (sign x)
+  (if (= x 0)
+      0
+      (if (< x 0) -1 1)))
 
-  
-  (define (cached-fontname i)
-    (string-append
-     "lilyfont"
-     (make-string 1 (integer->char (+ 65 i)))))
+(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 (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)))
     
-
-  (define (select-font name-mag-pair)
-    (let*
-	(
-	 (c (assoc name-mag-pair font-name-alist))
-	 )
-
-      (if (eq? c #f)
-	  (begin
-	    (display name-mag-pair)
-	    (display font-name-alist)
-	    (ly-warn (string-append
-		      "Programming error: No such font known " (car name-mag-pair))
-		     (number->string (cdr name-mag-pair))
-		     )
-	    
-	    "")				; issue no command	  
-	  (string-append " " (cdr c) " "))
-      ))
-
-    (define (font-load-command name-mag command)
-      (string-append
-       "/" command
-       " { /"
-       (symbol->string (car name-mag))
-       " findfont "
-       (number->string (cdr name-mag))
-       " 1000 div 12 mul  scalefont setfont } bind def "
-       "\n"))
-
-
-  (define (beam width slope thick)
-    (string-append
-     (numbers->string (list width slope thick)) " draw_beam" ))
-
-  (define (comment s)
-    (string-append "% " s))
-
-  (define (bracket arch_angle arch_width arch_height width height arch_thick thick)
-    (string-append
-     (numbers->string (list arch_angle arch_width arch_height width height arch_thick thick)) " draw_bracket" ))
-
-  (define (char i)
-    (invoke-char " show" i))
-
-  (define (crescendo thick w h cont )
-    (string-append 
-     (numbers->string (list w h (inexact->exact cont) thick))
-     " draw_crescendo"))
-
-  ;; what the heck is this interface ?
-  (define (dashed-slur thick dash l)
-    (string-append 
-     (apply string-append (map control->string l)) 
-     (number->string thick) 
-     " [ "
-     (number->string dash)
-     " "
-     (number->string (* 10 thick))	;UGH.  10 ?
-     " ] 0 draw_dashed_slur"))
-
-  (define (dashed-line thick on off dx dy)
-    (string-append 
-     (number->string dx)
-     " "
-     (number->string dy)
-     " "
-     (number->string thick) 
-     " [ "
-     (number->string on)
-     " "
-     (number->string off)
-     " ] 0 draw_dashed_line"))
-
-  (define (decrescendo thick w h cont)
-    (string-append 
-     (numbers->string (list w h (inexact->exact cont) thick))
-     " draw_decrescendo"))
-
-
-  (define (end-output)
-    "\nshowpage\n")
-  
-  (define (experimental-on) "")
-  
-  (define (filledbox breapth width depth height) 
-    (string-append (numbers->string (list breapth width depth height))
-		   " draw_box" ))
-
-  ;; obsolete?
-  (define (font-def i s)
-    (string-append
-     "\n/" (font i) " {/" 
-     (substring s 0 (- (string-length s) 4))
-     " findfont 12 scalefont setfont} bind def \n"))
-
-  (define (font-switch i)
-    (string-append (font i) " "))
-
-  (define (header-end)
-    (string-append
-     ;; URG: now we can't use scm output without Lily
-     (ly-gulp-file "lilyponddefs.ps")
-     " {exch pop //systemdict /run get exec} "
-     (ly-gulp-file "lily.ps")
-     "{ exch pop //systemdict /run get exec } "
-    ))
-  
-  (define (lily-def key val)
-
-     (if (string=? (substring key 0 (min (string-length "mudelapaper") (string-length key))) "mudelapaper")
-	 (string-append "/" key " {" val "} bind def\n")
-	 (string-append "/" key " (" val ") def\n")
-	 )
-     )
-
-  (define (header creator generate) 
-    (string-append
-     "%!PS-Adobe-3.0\n"
-     "%%Creator: " creator generate "\n"))
-  
-  (define (invoke-char s i)
-    (string-append 
-     "(\\" (inexact->string i 8) ") " s " " ))
-  
-  (define (invoke-dim1 s d) 
-    (string-append
-     (number->string (* d  (/ 72.27 72))) " " s ))
-
-  (define (placebox x y s) 
-    (string-append 
-     (number->string x) " " (number->string y) " {" s "} placebox "))
-
-  (define (bezier-sandwich l thick)
-    (string-append 
-     (apply string-append (map control->string l))
-     (number->string  thick)
-     " draw_bezier_sandwich"))
-
-  (define (start-line height)
-	  "\nstart_line {\n")
-  
-  (define (stem breapth width depth height) 
-    (string-append (numbers->string (list breapth width depth height))
-		   " draw_box" ))
-
-  (define (stop-line)
-      "}\nstop_line\n")
-
-  (define (text s)
-    (string-append "(" s ") show  "))
-
-
-  (define (volta h w thick vert_start vert_end)
-    (string-append 
-     (numbers->string (list h w thick (inexact->exact vert_start) (inexact->exact vert_end)))
-     " draw_volta"))
-
-  (define (tuplet ht gap dx dy thick dir)
-    (string-append 
-     (numbers->string (list ht gap dx dy thick (inexact->exact dir)))
-     " draw_tuplet"))
-
-
-  (define (unknown) 
-    "\n unknown\n")
-
-
-  (define (define-origin a b c ) "")
-  (define (no-origin) "")
-  
-  ;; PS
-  (cond ((eq? action-name 'all-definitions)
-	 `(begin
-	    (define beam ,beam)
-	    (define tuplet ,tuplet)
-	    (define bracket ,bracket)
-	    (define char ,char)
-	    (define crescendo ,crescendo)
-	    (define volta ,volta)
-	    (define bezier-sandwich ,bezier-sandwich)
-	    (define dashed-line ,dashed-line) 
-	    (define dashed-slur ,dashed-slur) 
-	    (define decrescendo ,decrescendo) 
-	    (define end-output ,end-output)
-	    (define experimental-on ,experimental-on)
-	    (define filledbox ,filledbox)
-	    (define font-def ,font-def)
-	    (define font-switch ,font-switch)
-	    (define header-end ,header-end)
-	    (define lily-def ,lily-def)
-	    (define font-load-command ,font-load-command)
-	    (define header ,header) 
-	    (define invoke-char ,invoke-char) 
-	    (define invoke-dim1 ,invoke-dim1)
-	    (define placebox ,placebox)
-	    (define select-font ,select-font)
-	    (define start-line ,start-line)
-	    (define stem ,stem)
-	    (define stop-line ,stop-line)
-	    (define stop-last-line ,stop-line)
-	    (define text ,text)
-	    (define no-origin ,no-origin)
-	    (define define-origin ,define-origin)
+    (if (pair?  d)
+		(cdr d)
+	     scm-output-expression)
 	    ))
-	((eq? action-name 'tuplet) tuplet)
-	((eq? action-name 'beam) beam)
-	((eq? action-name 'bezier-sandwich) bezier-sandwich)
-	((eq? action-name 'bracket) bracket)
-	((eq? action-name 'char) char)
-	((eq? action-name 'crescendo) crescendo)
-	((eq? action-name 'dashed-line) dashed-line) 
-	((eq? action-name 'dashed-slur) dashed-slur) 
-	((eq? action-name 'decrescendo) decrescendo)
-	((eq? action-name 'experimental-on) experimental-on)
-	((eq? action-name 'filledbox) filledbox)
-	((eq? action-name 'select-font) select-font)
-	((eq? action-name 'volta) volta)
-	(else (error "unknown tag -- PS-SCM " action-name))
-	)
-  )
-
-
-(define (arg->string arg)
-  (cond ((number? arg) (inexact->string arg 10))
-	((string? arg) (string-append "\"" arg "\""))
-	((symbol? arg) (string-append "\"" (symbol->string arg) "\""))))
 
-; ugh: naming.
-(define (func name . args)
-  (string-append 
-   "(" name 
-   (if (null? args) 
-       ""
-       (apply string-append 
-	      (map (lambda (x) (string-append " " (arg->string x))) args)))
-   ")\n"))
 
-(define (sign x)
-  (if (= x 0)
-      1
-      (if (< x 0) -1 1)))
-
-(define (gulp-file name)
-  (let* ((port (open-file name "r"))
-	 (content (let loop ((text ""))
-		       (let ((line (read-line port)))
-			    (if (or (eof-object? line)
-				    (not line)) 
-				text
-				(loop (string-append text line "\n")))))))
-	(close port)
-	content))
-
-;; urg: Use when standalone, do:
-;; (define ly-gulp-file scm-gulp-file)
-(define (scm-gulp-file name)
-  (set! %load-path 
-	(cons (string-append (getenv 'LILYPONDPREFIX) "/ly")
-	      (cons (string-append (getenv 'LILYPONDPREFIX) "/ps")
-		    %load-path)))
-  (let ((path (%search-load-path name)))
-       (if path
-	   (gulp-file path)
-	   (gulp-file name))))
-
-(define (scm-tex-output)
-  (ly-eval (tex-scm 'all-definitions)))
-				
-(define (scm-ps-output)
-  (ly-eval (ps-scm 'all-definitions)))
-
-(define (scm-as-output)
-  (ly-eval (as-scm 'all-definitions)))
-	
-(define (index-cell cell dir)
-  (if (equal? dir 1)
-      (cdr cell)
-      (car cell)))
-
-(define major-scale
-  '(
-    (0 . 0)
-    (1 . 0)
-    (2 . 0)
-    (3 . 0)
-    (4 . 0)
-    (5 . 0)
-    (6 . 0)
-    )
-  )
+(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"
+	   "pdf.scm"
+	   "pdftex.scm"
+      	   "c++.scm"
+	   "bass-figure.scm"
+	   "grob-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"
+	   "translator-property-description.scm"
+	   "script.scm"
+	   "drums.scm"
+	   "midi.scm"
+	   )))
 
-(begin
-  (eval-string (ly-gulp-file "interface.scm"))
-  (eval-string (ly-gulp-file "slur.scm"))
-  (eval-string (ly-gulp-file "font.scm"))  
-  (eval-string (ly-gulp-file "generic-property.scm"))
-  (eval-string (ly-gulp-file "basic-properties.scm"))
-  (eval-string (ly-gulp-file "chord-names.scm"))
-  (eval-string (ly-gulp-file "element-descriptions.scm"))
- )