X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=6876a9cb6563701963920ccfe40e268c9616de0a;hb=0af6d4cb04fa3e4aa69a7aecb76034e4cb1ec49b;hp=9c45773df07d055bc180b908ecade4a3e45a7b2b;hpb=1d7d22c0171288be6009b68e611beaed18be993c;p=lilypond.git

diff --git a/scm/lily.scm b/scm/lily.scm
index 9c45773df0..6876a9cb65 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -1,24 +1,109 @@
-; 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--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
-;(debug-enable 'backtrace)
+;;;
+;;; 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
-(define
-  (xnumbers->string l)
-  (string-append 
-   (map (lambda (n) (string-append (number->string n ) " ")) l)))
 
-(define
-  (numbers->string l)
-  (apply string-append 
-	 (map (lambda (n) (string-append (number->string n) " ")) l)))
+(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 (chop-decimal x) (if (< (abs x) 0.001) 0.0 x))
+(define (reduce operator list)
+      (if (null? (cdr list)) (car list)
+	  (operator (car list) (reduce operator (cdr list)))
+	  )
+      )
+
+
+(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))
@@ -34,136 +119,170 @@
     (number->string n radix)))
 
 
-(define
-  (control->string c)
-  (string-append
-   (string-append (number->string (car c)) " ")
-   (string-append (number->string (cadr c)) " ")))
-
+(define (control->string c)
+  (string-append (number->string (car c)) " "
+		 (number->string (cdr c)) " "))
 
-(define
-  (font i)
+(define (font i)
   (string-append
    "font"
    (make-string 1 (integer->char (+ (char->integer #\A) i)))
    ))
 
-
-
 (define (scm-scm action-name)
   1)
 
 (define security-paranoia #f)
 
 
-;; See documentation of Item::visibility_lambda_
-(define (postbreak_only_visibility d) (if (= d 1) '(#f . #f) '(#t . #t)))
-(define (spanbar_non_postbreak_visibility d) (if (= d -1) '(#t . #t) '(#f . #f)))
-
-(define (non_postbreak_visibility d) (if (= d 1) '(#t . #t) '(#f . #f)))
-
-
-;; Score_span_bars are only visible at start of line
-;; i.e. if break_dir == RIGHT == 1
-(define Span_bar_engraver_visibility non_postbreak_visibility)
-
-(define Span_score_bar_engraver_visibility postbreak_only_visibility)
-(define Piano_bar_engraver_visibility postbreak_only_visibility)
-(define Staff_group_bar_engraver_visibility postbreak_only_visibility)
-
-
+;; 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))))
+  )
 
 
 ;;;;;;;; TeX
 
-(define cmr-alist 
-  '(("bold" . "cmbx") 
-    ("dynamic" . "feta-din") 
-    ("finger" . "feta-nummer") 
-    ("typewriter" . "cmtt") 
-    ("italic" . "cmti") 
-    ("roman" . "cmr") 
-    ("large" . "cmbx") 
-    ("Large" . "cmbx") 
-    ("mark" . "feta-nummer") 
-    ("number" . "feta-nummer") 
-    ("volta" . "feta-nummer"))
-)
-
-(define script-alist '())
-(define (articulation-to-scriptdef a)
-  (assoc a script-alist)
+(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))
+	  ))
+   )
   )
 
-;; Map style names to TeX font names.  Return false if 
-;; no font name found. 
-(define (style-to-cmr s)
-  (assoc s cmr-alist )
+(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)
   )
 
+;;;;;;;;;;;;;;;;;;;;
 
-(define (tex-scm action-name)
 
+; 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 font-alist '())
-  (define font-count 0)
-  (define current-font "")
-  (define (clear-fontcache)
-    (begin
-      (set! font-alist '())
-      (set! font-count 0)
-      (set! current-font "")))
-  
-  (define (cached-fontname i)
-    (string-append
-     "\\lilyfont"
-     (make-string 1 (integer->char (+ 65 i)))))
-    
-  (define (select-font font-name)
-      (if (not (equal? font-name current-font))
+
+  (define (select-font name-mag-pair)
+    (let*
+	(
+	 (c (assoc name-mag-pair font-name-alist))
+	 )
+
+      (if (eq? c #f)
 	  (begin
-	    (set! current-font font-name)
-	    (define font-cmd (assoc font-name font-alist))
-	    (if (eq? font-cmd #f)
-		(begin
-		  (set! font-cmd (cached-fontname font-count))
-		  (set! font-alist (acons font-name font-cmd font-alist))
-		  (set! font-count (+ 1 font-count))
-		  (if (equal? font-name "")
-		      (error "Empty fontname -- SELECT-FONT"))
-		  (string-append "\\font" font-cmd "=" font-name font-cmd))
-		(cdr font-cmd)))
-	  ""				;no switch needed
-	  ))
+	    (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 h)
-    (embedded-ps ((ps-scm 'bracket) h)))
+  (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 w h cont)
-    (embedded-ps ((ps-scm 'crescendo) w h cont)))
+  (define (crescendo thick w h cont)
+    (embedded-ps ((ps-scm 'crescendo) thick w h cont)))
 
   (define (char i)
-    (string-append "\\show{" (inexact->string i 10) "}"))
+    (string-append "\\char" (inexact->string i 10) " "))
   
-  (define (decrescendo w h cont)
-    (embedded-ps ((ps-scm 'decrescendo) w h cont)))
+  (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"))
 
   (define (embedded-ps s)
     (string-append "\\embeddedps{" s "}"))
 
+  (define (comment s)
+    (string-append "% " s))
+  
   (define (end-output) 
-    "\n\\EndLilyPondOutput")
+	(begin
+; uncomment for some stats about lily memory	  
+;		(display (gc-stats))
+    (string-append "\n\\EndLilyPondOutput"
+		   ; Put GC stats here.
+		   )))
   
   (define (experimental-on)
-    "\\turnOnExperimentalFeatures")
+    "")
 
   (define (font-switch i)
     (string-append
@@ -173,11 +292,18 @@
     (string-append
      "\\font" (font-switch i) "=" s "\n"))
 
-  (define (generalmeter num den)
-    (string-append 
-     "\\generalmeter{" (number->string (inexact->exact num)) "}{" (number->string (inexact->exact den)) "}"))
+  (define (header-end)
+    (string-append
+     "\\special{! "
 
-  (define (header-end) "\\turnOnPostScript")
+     ;; 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
@@ -196,55 +322,42 @@
   ;;
   ;; need to do something to make this really safe.
   ;;
-  (if security-paranoia
-      (define (output-tex-string s)
-	(regexp-substitute/global #f "\\\\" s 'pre "$\\backslash$" 'post))
-      (define (output-tex-string s)    s))
-
+  (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\\" (output-tex-string key) "{" (output-tex-string val) "}\n"))
+     "\\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 
-     (number->string  (chop-decimal x)) "pt "))
+     (ly-number->string x) " \\outputscale "))
 
   (define (placebox x y s) 
     (string-append 
      "\\placebox{"
-     (number->dim y) "}{" (number->dim x) "}{" s "}"))
-
-  (define (pianobrace y)
-    (define step 1.0)
-    (define minht (* 2 mudelapaperstaffheight))
-    (define maxht (* 7 minht))
-    (string-append
-     "{\\bracefont " (char (max
-			    0
-			    (/  (- (min y (- maxht step)) minht) step))) "}"))
-
-
-
-  (define (rulesym h w) 
-    (string-append 
-     "\\vrule height " (number->dim (/ h 2))
-     " depth " (number->dim (/ h 2))
-     " width " (number->dim w)
-     )
-    )
-
-  (define (bezier-sandwich l)
-    (embedded-ps ((ps-scm 'bezier-sandwich) l)))
+     (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)
-    (begin
-      (clear-fontcache)
       (string-append"\\vbox to " (number->dim ht) "{\\hbox{%\n"))
-    )
-  (define (stop-line) 
-    "}\\vss}\\interscoreline")
 
+  (define (stop-line) 
+    "}\\vss}\\interscoreline\n")
+  (define (stop-last-line)
+    "}\\vss}")
   (define (filledbox breapth width depth height) 
     (string-append 
      "\\kern" (number->dim (- breapth))
@@ -252,27 +365,44 @@
      "depth " (number->dim depth)
      "height " (number->dim height) " "))
 
-
-
   (define (text s)
     (string-append "\\hbox{" (output-tex-string s) "}"))
   
-  (define (tuplet dx dy thick dir)
-    (embedded-ps ((ps-scm 'tuplet) dx dy thick dir)))
-
-  (define (volta w thick last)
-    (embedded-ps ((ps-scm 'volta) w thick last)))
+  (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)
@@ -280,116 +410,143 @@
 	    (define filledbox ,filledbox)
 	    (define font-def ,font-def)
 	    (define font-switch ,font-switch)
-	    (define generalmeter ,generalmeter)
 	    (define header-end ,header-end)
 	    (define lily-def ,lily-def)
 	    (define header ,header) 
 	    (define invoke-char ,invoke-char) 
 	    (define invoke-dim1 ,invoke-dim1)
-	    (define pianobrace ,pianobrace)
 	    (define placebox ,placebox)
-	    (define rulesym ,rulesym)
 	    (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)
 	    ))
 
 	((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 'generalmeter) generalmeter)
 	((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 'rulesym) rulesym)
 	((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))
 	)
   )
 
+
 ;;;;;;;;;;;; PS
 (define (ps-scm action-name)
 
-
   ;; alist containing fontname -> fontcommand assoc (both strings)
   (define font-alist '())
   (define font-count 0)
   (define current-font "")
-  (define (clear-fontcache)
-    (begin
-      (set! font-alist '())
-      (set! font-count 0)
-      (set! current-font "")))
+
   
   (define (cached-fontname i)
     (string-append
      "lilyfont"
      (make-string 1 (integer->char (+ 65 i)))))
+    
 
-  (define (select-font font-name)
-      (if (not (equal? font-name current-font))
+  (define (select-font name-mag-pair)
+    (let*
+	(
+	 (c (assoc name-mag-pair font-name-alist))
+	 )
+
+      (if (eq? c #f)
 	  (begin
-	    (set! current-font font-name)
-	    (define font-cmd (assoc font-name font-alist))
-	    (if (eq? font-cmd #f)
-		(begin
-		  (set! font-cmd (cached-fontname font-count))
-		  (set! font-alist (acons font-name font-cmd font-alist))
-		  (set! font-count (+ 1 font-count))
-		  (string-append "\n/" font-cmd " {/"
-				 font-name
-				 " findfont 12 scalefont setfont} bind def \n"
-				 font-cmd " \n"))
-		(string-append (cdr font-cmd) " ")))
-	  ; font-name == current-font no switch needed
-	  ""				
-	  ))
-		  
+	    (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 " ))
+     (numbers->string (list width slope thick)) " draw_beam" ))
+
+  (define (comment s)
+    (string-append "% " s))
 
-  (define (bracket h)
-    (invoke-dim1 "draw_bracket" h))
+  (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))
+    (invoke-char " show" i))
 
-  (define (crescendo w h cont)
+  (define (crescendo thick w h cont )
     (string-append 
-     (numbers->string (list w h (inexact->exact cont)))
-     "draw_crescendo"))
+     (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) 
      " [ "
-     (if (> 1 dash) (number->string (- (* thick dash) thick)) "0") " "
-     (number->string (* 2 thick))
+     (number->string dash)
+     " "
+     (number->string (* 10 thick))	;UGH.  10 ?
      " ] 0 draw_dashed_slur"))
 
-  (define (decrescendo w h cont)
+  (define (dashed-line thick on off dx dy)
     (string-append 
-     (numbers->string (list w h (inexact->exact cont)))
-     "draw_decrescendo"))
+     (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)
@@ -399,7 +556,7 @@
   
   (define (filledbox breapth width depth height) 
     (string-append (numbers->string (list breapth width depth height))
-		   "draw_stem" ))
+		   " draw_box" ))
 
   ;; obsolete?
   (define (font-def i s)
@@ -411,13 +568,22 @@
   (define (font-switch i)
     (string-append (font i) " "))
 
-  (define (generalmeter num den)
-    (string-append (number->string (inexact->exact num)) " " (number->string (inexact->exact den)) " generalmeter "))
-
-  (define (header-end) "")
-  (define (lily-def key val)
+  (define (header-end)
     (string-append
-     "/" key " {" val "} bind def\n"))
+     ;; 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
@@ -435,29 +601,19 @@
   (define (placebox x y s) 
     (string-append 
      (number->string x) " " (number->string y) " {" s "} placebox "))
-  (define (pianobrace y)
-    ""
-    )
-
-  (define (rulesym x y) 
-    (string-append 
-     (number->string x) " "
-     (number->string y) " "
-     "rulesym"))
 
-  (define (bezier-sandwich l)
+  (define (bezier-sandwich l thick)
     (string-append 
-     (apply string-append (map control->string l)) 
+     (apply string-append (map control->string l))
+     (number->string  thick)
      " draw_bezier_sandwich"))
 
-  (define (start-line)
-    (begin
-      (clear-fontcache)
-      "\nstart_line {\n"))
+  (define (start-line height)
+	  "\nstart_line {\n")
   
   (define (stem breapth width depth height) 
     (string-append (numbers->string (list breapth width depth height))
-		   "draw_stem" ))
+		   " draw_box" ))
 
   (define (stop-line)
       "}\nstop_line\n")
@@ -466,21 +622,24 @@
     (string-append "(" s ") show  "))
 
 
-  (define (volta w thick last)
+  (define (volta h w thick vert_start vert_end)
     (string-append 
-     (numbers->string (list w thick (inexact->exact last)))
-     "draw_volta"))
+     (numbers->string (list h w thick (inexact->exact vert_start) (inexact->exact vert_end)))
+     " draw_volta"))
 
-  (define (tuplet dx dy thick dir)
+  (define (tuplet ht gap dx dy thick dir)
     (string-append 
-     (numbers->string (list dx dy thick (inexact->exact dir)))
-     "draw_tuplet"))
+     (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
@@ -491,6 +650,7 @@
 	    (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)
@@ -498,20 +658,21 @@
 	    (define filledbox ,filledbox)
 	    (define font-def ,font-def)
 	    (define font-switch ,font-switch)
-	    (define generalmeter ,generalmeter)
-	    (define pianobrace ,pianobrace)
 	    (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 rulesym ,rulesym)
 	    (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)
 	    ))
 	((eq? action-name 'tuplet) tuplet)
 	((eq? action-name 'beam) beam)
@@ -519,6 +680,7 @@
 	((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)
@@ -529,26 +691,156 @@
 	)
   )
 
-					;
-; Russ McManus, <mcmanus@IDT.NET>  
-; 
-; I use the following, which should definitely be provided somewhere
-; in guile, but isn't, AFAIK:
-; 
-; 
-
-(define (hash-table-for-each fn ht)
-  (do ((i 0 (+ 1 i)))
-      ((= i (vector-length ht)))
-    (do ((alist (vector-ref ht i) (cdr alist)))
-	((null? alist) #t)
-      (fn (car (car alist)) (cdr (car alist))))))
-
-(define (hash-table-map fn ht)
-  (do ((i 0 (+ 1 i))
-       (ret-ls '()))
-      ((= i (vector-length ht)) (reverse ret-ls))
-    (do ((alist (vector-ref ht i) (cdr alist)))
-	((null? alist) #t)
-      (set! ret-ls (cons (fn (car (car alist)) (cdr (car alist))) ret-ls)))))
 
+(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* ((file (open-input-file name))
+	 (text (read-delimited "" file)))
+    (close file)
+    text))
+
+;; 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)
+    )
+  )
+
+(begin
+  (eval-string (ly-gulp-file "interface.scm"))
+  (eval-string (ly-gulp-file "beam.scm"))
+  (eval-string (ly-gulp-file "slur.scm"))
+  (eval-string (ly-gulp-file "font.scm"))
+  (eval-string (ly-gulp-file "auto-beam.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"))
+ )
+
+
+;;
+;; (name . (glyph clef-position octavation))
+;; -- the name clefOctavation is misleading the value 7 is 1 octave not 7 Octaves.
+;;
+(define supported-clefs '(
+	  ("treble" . ("clefs-G" -2 0))
+	  ("violin" . ("clefs-G" -2 0))
+	  ("G" . ("clefs-G" -2 0))
+	  ("G2" . ("clefs-G" -2 0))
+	  ("french" . ("clefs-G" -4  0))
+	  ("soprano" . ("clefs-C" -4  0))
+	  ("mezzosoprano" . ("clefs-C" -2  0))
+	  ("alto" . ("clefs-C" 0  0))
+	  ("tenor" . ("clefs-C" 2  0))
+	  ("baritone" . ("clefs-C" 4  0))
+	  ("varbaritone"  . ("clefs-F" 0 0))
+	  ("bass" . ("clefs-F" 2  0))
+	  ("F" . ( "clefs-F" 2 0))
+	  ("subbass" . ("clefs-F" 4 0))
+
+	  ;; should move mensural stuff to separate file? 
+	  ("vaticana_do1" . ("clefs-vaticana_do" -1 0))
+	  ("vaticana_do2" . ("clefs-vaticana_do" 1 0))
+	  ("vaticana_do3" . ("clefs-vaticana_do" 3 0))
+	  ("vaticana_fa1" . ("clefs-vaticana_fa" -1 0))
+	  ("vaticana_fa2" . ("clefs-vaticana_fa" 1 0))
+	  ("medicaea_do1" . ("clefs-medicaea_do" -1 0))
+	  ("medicaea_do2" . ("clefs-medicaea_do" 1 0))
+	  ("medicaea_do3" . ("clefs-medicaea_do" 3 0))
+	  ("medicaea_fa1" . ("clefs-medicaea_fa" -1 0))
+	  ("medicaea_fa2" . ("clefs-medicaea_fa" 1 0))
+	  ("hufnagel_do1" . ("clefs-hufnagel_do" -1 0))
+	  ("hufnagel_do2" . ("clefs-hufnagel_do" 1 0))
+	  ("hufnagel_do3" . ("clefs-hufnagel_do" 3 0))
+	  ("hufnagel_fa1" . ("clefs-hufnagel_fa" -1 0))
+	  ("hufnagel_fa2" . ("clefs-hufnagel_fa" 1 0))
+	  ("hufnagel" . ("clefs-hufnagel_do_fa" 4 0))
+	  ("mensural1_c1" . ("clefs-mensural1_c" -4 0))
+	  ("mensural1_c2" . ("clefs-mensural1_c" -2 0))
+	  ("mensural1_c3" . ("clefs-mensural1_c" 0 0))
+	  ("mensural1_c4" . ("clefs-mensural1_c" 2 0))
+	  ("mensural2_c1" . ("clefs-mensural2_c" -4 0))
+	  ("mensural2_c2" . ("clefs-mensural2_c" -2 0))
+	  ("mensural2_c3" . ("clefs-mensural2_c" 0 0))
+	  ("mensural2_c4" . ("clefs-mensural2_c" 2 0))
+	  ("mensural2_c5" . ("clefs-mensural2_c" 4 0))
+	  ("mensural3_c1" . ("clefs-mensural3_c" -2 0))
+	  ("mensural3_c2" . ("clefs-mensural3_c" 0 0))
+	  ("mensural3_c3" . ("clefs-mensural3_c" 2 0))
+	  ("mensural3_c4" . ("clefs-mensural3_c" 4 0))
+	  ("mensural_f" . ("clefs-mensural_f" 2 0))
+	)
+)
+
+(define (clef-name-to-properties cl)
+  (let ((e (assoc cl supported-clefs))
+	)
+    (if (pair? e)
+	`(((symbol . clefGlyph)
+	   (type . property-set)
+	   (value . ,(cadr e))
+	   )
+	  ((symbol . clefPosition)
+	   (type . property-set)
+	   (value . ,(caddr e))
+	   )
+	  ((symbol . clefOctavation)
+	   (type . property-set)
+	   (value . ,(caddr (cdr e)))
+	  )
+	  )
+	(begin
+	  (ly-warn (string-append "Unknown clef type `" cl "'\nSee scm/lily.scm for supported clefs"))
+	  '())
+    )))