X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=677c0e44e764a055793f0af06a99ee5673ef5ce3;hb=d3c90f63573d53cfb191cc48f8f6ee672a5ca37a;hp=a87b677c266824442e1899329516656db69b1a46;hpb=5f42fe18c41237a73d99fd76b34e434a33598704;p=lilypond.git

diff --git a/scm/lily.scm b/scm/lily.scm
index a87b677c26..677c0e44e7 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -5,20 +5,48 @@
 ; (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
+;
+; This file contains various routines in Scheme that are easier to 
+; do here than in C++.  At present it is a unorganised mess. Sorry. 
+;
+
+
 ;(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))
+
+;; The regex module may not be available, or may be broken.
+;; If you have trouble with regex, define #f
+;;(define use-regex #t)
+;;(define use-regex #f)
+
+(define use-regex
+  (let ((os (string-downcase (vector-ref (uname) 0))))
+    (not (equal? "cygwin" (substring os 0 (min 6 (string-length os)))))))
+
+;; do nothing in .scm output
+(define (comment s) "")
+
+(define (mm-to-pt x)
+  (* (/ 72.27 25.40) x)
+  )
 
-(define (chop-decimal x) (if (< (abs x) 0.001) 0.0 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)))
+	  )
+      )
+
+
+(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,15 +62,12 @@
     (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)))
@@ -57,81 +82,228 @@
 
 
 ;; See documentation of Item::visibility_lambda_
-(define (postbreak_only_visibility d) (if (= d 1) '(#f . #f) '(#t . #t)))
-(define (non_postbreak_visibility d) (if (= d -1) '(#t . #t) '(#f . #f)))
-(define (spanbar_non_postbreak_visibility d) (if (= d -1) '(#t . #t) '(#f . #f)))
+(define (begin-of-line-visible d) (if (= d 1) '(#f . #f) '(#t . #t)))
+(define (spanbar-begin-of-line-invisible d) (if (= d -1) '(#t . #t) '(#f . #f)))
+(define (all-visible d) '(#f . #f))
+(define (all-invisible d) '(#t . #t))
+(define (begin-of-line-invisible d) (if (= d 1) '(#t . #t) '(#f . #f)))
+(define (end-of-line-invisible 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_score_bar_visibility postbreak_only_visibility)
-(define Piano_bar_visibility postbreak_only_visibility)
-(define Staff_group_bar_visibility postbreak_only_visibility)
+(define Span_bar_engraver-visibility begin-of-line-invisible)
+(define mark-visibility end-of-line-invisible)
+
+;; Spacing constants for prefatory matter.
+;;
+;; rules for this spacing are much more complicated than this. See [Wanske] page 126 -- 134, [Ross] pg 143 -- 147
+;;
+;;
+
+;; (Measured in staff space)
+(define space-alist
+ '(
+   ((none Instrument_name) . (extra-space 1.0))
+   ((Instrument_name Left_edge_item) . (extra-space 1.0))
+   ((Left_edge_item Clef_item) . (extra-space 1.0))
+   ((none Left_edge_item) . (extra-space 0.0))
+   ((Left_edge_item Staff_bar) . (extra-space 0.0))	    
+;   ((none Left_edge_item) . (extra-space -15.0))
+;   ((none Left_edge_item) . (extra-space -15.0))
+   ((none Clef_item) . (minimum-space 1.0))
+   ((none Staff_bar) . (minimum-space 0.0))
+   ((none Clef_item) . (minimum-space 1.0))
+   ((none Key_item) . (minimum-space 0.5))
+   ((none Time_signature) . (extra-space 0.0))
+   ((none begin-of-note) . (minimum-space 1.5))
+   ((Clef_item Key_item) . (minimum-space 4.0))
+   ((Key_item Time_signature) . (extra-space 1.0))
+   ((Clef_item  Time_signature) . (minimum-space 3.5))
+   ((Staff_bar Clef_item) .   (minimum-space 1.0))
+   ((Clef_item  Staff_bar) .  (minimum-space 3.7))
+   ((Time_signature Staff_bar) .  (minimum-space 2.0))
+   ((Key_item  Staff_bar) .  (extra-space 1.0))
+   ((Staff_bar Time_signature) . (minimum-space 1.5)) ;double check this.
+   ((Time_signature begin-of-note) . (extra-space 2.0)) ;double check this.
+   ((Key_item begin-of-note) . (extra-space 2.5))
+   ((Staff_bar begin-of-note) . (extra-space 1.0))
+   ((Clef_item begin-of-note) . (minimum-space 5.0))
+   ((none Breathing_sign) . (minimum-space 0.0))
+   ((Breathing_sign Key_item) . (minimum-space 1.5))
+   ((Breathing_sign begin-of-note) . (minimum-space 1.0))
+   ((Breathing_sign Staff_bar) . (minimum-space 1.5))
+   ((Breathing_sign Clef_item) . (minimum-space 2.0))
+   )
+)
+
+;; (define (ly-warn s) (error s))
+(define (break-align-spacer this next)
+  (let ((entry (assoc (list this next) space-alist)))
+    (if entry
+	(cdr entry)
+	(begin (ly-warn (string-append "Unknown spacing pair `" this "', `" next "'"))
+	       '(minimum-space 0.0)))))
+  
+
+
+;;;;;;;; TeX
 
+;; this is silly, can't we use something like
+;; roman-0, roman-1 roman+1 ?
+(define cmr-alist 
+  '(("bold" . "cmbx") 
+    ("brace" . "feta-braces")
+    ("default" . "cmr10")
+    ("dynamic" . "feta-din") 
+    ("feta" . "feta") 
+    ("feta-1" . "feta") 
+    ("feta-2" . "feta") 
+    ("typewriter" . "cmtt") 
+    ("italic" . "cmti") 
+    ("roman" . "cmr") 
+    ("script" . "cmr") 
+    ("large" . "cmbx") 
+    ("Large" . "cmbx") 
+    ("mark" . "feta-nummer") 
+    ("finger" . "feta-nummer")
+    ("timesig" . "feta-nummer")
+    ("number" . "feta-nummer") 
+    ("volta" . "feta-nummer"))
+)
+
+(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 (magstep i)
+  (cdr (assoc i '((-4 . 482)
+		  (-3 . 579)
+		  (-2 . 694)
+		  (-1 . 833)
+		  (0 . 1000)
+		  (1 . 1200) 
+		  (2 . 1440)
+		  (3 . 1728)
+		  (4 . 2074))
+	      )
+       )
+  )
+	     
+(define script-alist '())
+(define (articulation-to-scriptdef a)
+  (assoc a script-alist)
+  )
 
+;; Map style names to TeX font names.  Return false if 
+;; no font name found. 
+(define (style-to-cmr s)
+  (assoc s cmr-alist )
+  )
+	    
 
-;;;;;;;; TeX
 
-(define (tex-scm action-name)
+(define font-name-alist  '())
+(define (font-command name-mag)
+    (cons name-mag
+	  (string-append  "magfont"
+			  (string-encode-integer (hashq (car name-mag) 1000000))
+			  "m"
+			  (string-encode-integer (cdr name-mag)))
 
+	  )
+    )
+(define (define-fonts names)
+  (set! font-name-alist (map font-command names))
+  (apply string-append
+	 (map (lambda (x)
+		(font-load-command (car x) (cdr x))) font-name-alist)
+  ))
+
+(define (fontify name exp)
+  (string-append (select-font name)
+		 exp)
+  )
+
+;;;;;;;;;;;;;;;;;;;;
+
+
+; Make a function that checks score element for being of a specific type. 
+(define (make-type-checker name)
+  (lambda (elt)
+    (not (not (memq name (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 font-name-symbol)
+    (let*
+	(
+	 (c (assoc font-name-symbol 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 "\\font" font-cmd "=" font-name font-cmd))
-		(cdr font-cmd)))
-	  ""				;no switch needed
-	  ))
+	    (ly-warn (string-append
+		      "Programming error: No such font known " (car font-name-symbol)))
+	    "")				; issue no command
+	  (string-append "\\" (cdr 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 dash w)
+    (embedded-ps ((ps-scm 'dashed-line) thick dash w)))
+
+  (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 "="
+     (symbol->string (car name-mag))
+     " scaled "
+     (number->string (magstep (cdr name-mag)))
+     "\n"))
 
   (define (embedded-ps s)
     (string-append "\\embeddedps{" s "}"))
 
+  (define (comment s)
+    (string-append "% " s))
+  
   (define (end-output) 
     "\n\\EndLilyPondOutput")
   
   (define (experimental-on)
-    "\\turnOnExperimentalFeatures")
+    "")
 
   (define (font-switch i)
     (string-append
@@ -141,11 +313,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 \\turnOnPostScript"))
 
   (define (header creator generate) 
     (string-append
@@ -164,53 +343,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) " pt "))
 
   (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))) "}"))
+     (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 (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)))
-
-
-  (define (start-line)
-    (begin
-      (clear-fontcache)
-      "\\hbox{%\n")
-    )
-
+  (define (stop-line) 
+    "}\\vss}\\interscoreline")
+  (define (stop-last-line)
+    "}\\vss}")
   (define (filledbox breapth width depth height) 
     (string-append 
      "\\kern" (number->dim (- breapth))
@@ -218,29 +386,27 @@
      "depth " (number->dim depth)
      "height " (number->dim height) " "))
 
-  (define (stop-line) 
-    "}\\interscoreline")
-
-
   (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 (tuplet ht gapx dx dy thick dir)
+    (embedded-ps ((ps-scm 'tuplet) ht gapx dx dy thick dir)))
 
-  (define (volta w thick last)
-    (embedded-ps ((ps-scm 'volta) w thick last)))
+  (define (volta h w thick vert_start vert_end)
+    (embedded-ps ((ps-scm 'volta) h w thick vert_start vert_end)))
 
   ;; 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)
@@ -248,18 +414,16 @@
 	    (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)
@@ -269,92 +433,128 @@
 	((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 (mag-to-size m)
+    (number->string (case m 
+		      (0 12)
+		      (1 12)
+		      (2 14) ; really: 14.400
+		      (3 17) ; really: 17.280
+		      (4 21) ; really: 20.736
+		      (5 24) ; really: 24.888
+		      (6 30) ; really: 29.856
+		      )))
+  
+  
+  (define (select-font font-name-symbol)
+    (let*
+	(
+	 (c (assoc font-name-symbol font-name-alist))
+	 )
 
-  (define (select-font font-name)
-      (if (not (equal? font-name current-font))
+      (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"))
-		(cdr font-cmd)))
-	  ""				;no switch needed
-	  ))
-		  
+	    (ly-warn (string-append
+		      "Programming error: No such font known " (car font-name-symbol)))
+	    "")				; 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 (magstep (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 dash width)
     (string-append 
-     (numbers->string (list w h (inexact->exact cont)))
-     "draw_decrescendo"))
+     (number->string width) 
+     " "
+     (number->string thick) 
+     " [ "
+     (number->string dash)
+     " "
+     (number->string dash)
+     " ] 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)
@@ -362,27 +562,36 @@
   
   (define (experimental-on) "")
   
-  (define (filledbox kern width height depth) 
-    (string-append (numbers->string (list kern width height depth))
-		   "draw_stem" ))
+  (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"))
+     " findfont 12 scalefont setfont} bind def \n"))
 
   (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
@@ -401,42 +610,35 @@
     (string-append 
      (number->string x) " " (number->string y) " {" s "} placebox "))
 
-  (define (rulesym x y) 
+  (define (bezier-sandwich l thick)
     (string-append 
-     (number->string x) " "
-     (number->string y) " "
-     "rulesym"))
-
-  (define (bezier-sandwich l)
-    (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 kern width height depth) 
-    (string-append (numbers->string (list kern width height depth))
-		   "draw_stem" ))
+  (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 f s)
-    (string-append "(" s ") set" f " "))
+  (define (text s)
+    (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) 
@@ -453,6 +655,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)
@@ -460,18 +663,18 @@
 	    (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 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)
 	    ))
 	((eq? action-name 'tuplet) tuplet)
@@ -480,6 +683,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)
@@ -489,9 +693,240 @@
 	(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) "\""))))
+
+(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
+      (inexact->exact (/ x (abs x)))))
+
+;;;; AsciiScript as
+(define (as-scm action-name)
+
+  (define (beam width slope thick)
+	  (string-append
+	   (func "set-line-char" "#")
+	   (func "rline-to" width (* width slope))
+	   ))
+
+  ; simple flat slurs
+  (define (bezier-sandwich l thick)
+	  (let (
+		(c0 (cadddr l))
+		(c1 (cadr l))
+		(c3 (caddr l)))
+	       (let* ((x (car c0))
+		      (dx (- (car c3) x))
+		      (dy (- (cdr c3) (cdr c0)))
+		      (rc (/ dy dx))
+		      (c1-dx (- (car c1) x))
+		      (c1-line-y (+ (cdr c0) (* c1-dx rc)))
+		      (dir (if (< c1-line-y (cdr c1)) 1 -1))
+		      (y (+ -1 (* dir (max (* dir (cdr c0)) (* dir (cdr c3)))))))
+		     (string-append
+		      (func "rmove-to" x y)
+		      (func "put" (if (< 0 dir) "/" "\\\\"))
+		      (func "rmove-to" 1 (if (< 0 dir) 1 0))
+		      (func "set-line-char" "_")
+		      (func "h-line" (- dx 1))
+		      (func "rmove-to" (- dx 1) (if (< 0 dir) -1 0))
+		      (func "put" (if (< 0 dir) "\\\\" "/"))))))
+
+  (define (bracket arch_angle arch_width arch_height width height arch_thick thick)
+	  (string-append
+	   (func "rmove-to" (+ width 1) (- (/ height -2) 1))
+	   (func "put" "\\\\")
+	   (func "set-line-char" "|")
+	   (func "rmove-to" 0 1)
+	   (func "v-line" (+ height 1))
+	   (func "rmove-to" 0 (+ height 1))
+	   (func "put" "/")
+	   ))
+
+  (define (char i)
+    (func "char" i))
+
+  (define (end-output) 
+    (func "end-output"))
   
+  (define (experimental-on)
+	  "")
+
+  (define (filledbox breapth width depth height)
+	  (let ((dx (+ width breapth))
+		(dy (+ depth height)))
+	       (string-append 
+		(func "rmove-to" (* -1 breapth) (* -1 depth))
+		(if (< dx dy)
+		    (string-append
+		     (func "set-line-char" 
+			   (if (<= dx 1) "|" "#"))
+		     (func "v-line" dy))
+		    (string-append
+		     (func "set-line-char" 
+			   (if (<= dy 1) "-" "="))
+		    (func "h-line" dx))))))
+
+  (define (font-load-command name-mag command)
+    (func "load-font" (car name-mag) (magstep (cdr name-mag))))
 
-;
+  (define (header creator generate) 
+    (func "header" creator generate))
+
+  (define (header-end) 
+    (func "header-end"))
+
+  ;; urg: this is good for half of as2text's execution time
+  (define (xlily-def key val)
+	  (string-append "(define " key " " (arg->string val) ")\n"))
+
+  (define (lily-def key val)
+	  (if 
+	   (or (equal? key "mudelapaperlinewidth")
+	       (equal? key "mudelapaperstaffheight"))
+	   (string-append "(define " key " " (arg->string val) ")\n")
+	   ""))
+
+  (define (placebox x y s) 
+    (let ((ey (inexact->exact y)))
+	  (string-append "(move-to " (number->string (inexact->exact x)) " "
+			 (if (= 0.5 (- (abs y) (abs ey)))
+			     (number->string y)
+			     (number->string ey))
+			 ")\n" s)))
+		       
+  (define (select-font font-name-symbol)
+    (let* ((c (assoc font-name-symbol font-name-alist)))
+      (if (eq? c #f)
+	  (begin
+	    (ly-warn 
+	     (string-append 
+	      "Programming error: No such font known " 
+	      (car font-name-symbol)))
+	    "")				; issue no command
+	  (func "select-font" (car font-name-symbol)))))
+
+  (define (start-line height)
+	  (func "start-line" height))
+
+  (define (stop-line)
+	  (func "stop-line"))
+
+  (define (text s)
+	  (func "text" s))
+
+  (define (volta h w thick vert-start vert-end)
+	  ;; urg
+	  (string-append
+	   (func "set-line-char" "|")
+	   (func "rmove-to" 0 -4)
+	   ;; definition strange-way around
+	   (if (= 0 vert-start)
+	      (func "v-line" h)
+	       "")
+	   (func "rmove-to" 1 h)
+	   (func "set-line-char" "_")
+	   (func "h-line" (- w 1))
+	   (func "set-line-char" "|")
+	   (if (= 0 vert-end)
+	       (string-append
+		(func "rmove-to" (- w 1) (* -1 h))
+		(func "v-line" (* -1 h)))
+	       "")))
+
+  (cond ((eq? action-name 'all-definitions)
+	 `(begin
+	    (define beam ,beam)
+	    (define bracket ,bracket)
+	    (define char ,char)
+	    ;;(define crescendo ,crescendo)
+	    (define bezier-sandwich ,bezier-sandwich)
+	    ;;(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-load-command ,font-load-command)
+	    ;;(define font-switch ,font-switch)
+	    (define header ,header) 
+	    (define header-end ,header-end)
+	    (define lily-def ,lily-def)
+	    ;;(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 tuplet ,tuplet)
+	    (define volta ,volta)
+	    ))
+	;;((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-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 -- MUSA-SCM " action-name))
+	)
+  )
+
+
+(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 name) (scm-gulp-file name))
+(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)
+  (eval (tex-scm 'all-definitions)))
+				
+(define (scm-ps-output)
+  (eval (ps-scm 'all-definitions)))
+
+(define (scm-as-output)
+  (eval (as-scm 'all-definitions)))
+				
 ; Russ McManus, <mcmanus@IDT.NET>  
 ; 
 ; I use the following, which should definitely be provided somewhere
@@ -514,3 +949,46 @@
 	((null? alist) #t)
       (set! ret-ls (cons (fn (car (car alist)) (cdr (car alist))) ret-ls)))))
 
+
+
+(define (index-cell cell dir)
+  (if (equal? dir 1)
+      (cdr cell)
+      (car cell)))
+
+;
+; How should a  bar line behave at a break? 
+;
+(define (break-barline glyph dir)
+   (let ((result (assoc glyph 
+			'((":|:" . (":|" . "|:"))
+			  ("|" . ("|" . ""))
+			  ("|s" . (nil . "|"))
+			  ("|:" . ("|" . "|:"))
+			  ("|." . ("|." . nil))
+			  (":|" . (":|" . nil))
+			  ("||" . ("||" . nil))
+			  (".|." . (".|." . nil))
+			  ("scorebar" . (nil . "scorepostbreak"))
+			  ("brace" . (nil . "brace"))
+			  ("bracket" . (nil . "bracket"))  
+			  )
+			)))
+
+     (if (equal? result #f)
+	 (ly-warn (string-append "Unknown bar glyph: `" glyph "'"))
+	 (index-cell (cdr result) dir))
+     )
+   )
+     
+
+(define (slur-ugly ind ht)
+  (if (and
+;       (< ht 4.0)
+       (< ht (* 4 ind))
+       (> ht (* 0.4 ind))
+       (> ht (+ (* 2 ind) -4))
+       (< ht (+ (* -2 ind) 8)))
+      #f
+      (cons ind  ht)
+  ))