;
; (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
-; TODO
-; - naming
-; - ready ps code (draw_bracket) vs tex/ps macros/calls (pianobrace),
-; all preparations from ps,tex to scm
+
+;(debug-enable 'backtrace)
;;; library funtions
+
+; :use-module (ice-9 regex))
+
(define
(xnumbers->string l)
(string-append
(map (lambda (n) (string-append (number->string n ) " ")) l)))
+(define (reduce operator list)
+ (if (null? (cdr list)) (car list)
+ (operator (car list) (reduce operator (cdr list)))
+ )
+ )
+
+
+(define (glue-2-strings a b) (string-append a " " b))
+
(define
(numbers->string l)
- (apply string-append
- (map (lambda (n) (string-append (number->string n) " ")) l)))
+ (reduce glue-2-strings (map number->string l)))
(define (chop-decimal x) (if (< (abs x) 0.001) 0.0 x))
(string-append (number->string (cadr c)) " ")))
-(define
- (font i)
+(define (font i)
(string-append
"font"
(make-string 1 (integer->char (+ (char->integer #\A) i)))
(define security-paranoia #f)
-;;;;;;;;
-;;; UGH. THESE SUCK!
-
-(define (empty)
- "")
-
-(define (empty1 a)
- "")
-
-(define (empty2 a b )
- "")
+;; 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)))
+(define (non_prebreak_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 mark-visibility non_prebreak_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)
+
+;; Spacing constants for prefatory matter.
+;;
+;; rules for this spacing are much more complicated than this. See [Wanske] page 126 -- 134, [Ross] pg 143 -- 147
+;;
+;;
+
+(define space-alist
+ '(
+ (("" "Clef_item") . (minimum_space 1.0))
+ (("" "Staff_bar") . (minimum_space 0.0))
+ (("" "Clef_item") . (minimum_space 1.0))
+ (("" "Key_item") . (minimum_space 0.5))
+ (("" "Span_bar") . (extra_space 0.0))
+ (("" "Time_signature") . (extra_space 0.0))
+ (("" "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))
+ (("Span_bar" "Clef_item") . (extra_space 1.0))
+ (("Clef_item" "Span_bar") . (minimum_space 3.7))
+ (("Time_signature" "Span_bar") . (minimum_space 2.0))
+ (("Key_item" "Span_bar") . (minimum_space 2.5))
+ (("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))
+ (("" "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 (break-align-spacer this next)
+ (let ((entry (assoc `(,this ,next) space-alist)))
+ (if entry
+ (cdr entry)
+ (begin (ly-warn (string-append "Unknown spacing pair `" this "', `" next "'"))
+ '(minimum_space 0.0)))))
+
+
-(define emptybar empty1)
+;;;;;;;; TeX
-;;; and these suck as well.
-(define (setdynamic s) (text "dynamic" (string-append "\\" s)))
-(define (setroman s) (text "text" s))
-(define (settypewriter s) (text "typewriter" s))
-(define (setnumber s) (text "number" s))
-(define (setbold s) (text "bold" s))
-(define (setlarge s) (text "large" s))
-(define (setLarge s) (text "Large" s))
-(define (setmark s) (text "mark" s))
-(define (setfinger s) (text "finger" s))
-(define (setitalic s) (text "italic" s))
-(define (setnumber-1 s) (text "numberj" s))
-
+(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)
+ )
+;; 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 (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 magnification)
+ (if (not (equal? font-name current-font))
+ (let* ((font-cmd (assoc font-name font-alist)))
+ (set! current-font font-name)
+ (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"))
+ (if (> magnification 0)
+ (string-append "\\font" font-cmd "=" font-name
+ " scaled \\magstep "
+ (number->string magnification) font-cmd)
+ (string-append "\\font" font-cmd "=" font-name font-cmd)))
+
+ (cdr font-cmd)))
+ "" ;no switch needed
+ ))
+
(define (beam width slope thick)
(embedded-ps ((ps-scm 'beam) width slope 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 (decrescendo w h cont)
- (embedded-ps ((ps-scm 'decrescendo) w h cont)))
+ (define (crescendo thick w h cont)
+ (embedded-ps ((ps-scm 'crescendo) thick w h cont)))
- (define
- (doublebar h)
- (invoke-dim1 "doublebar" h))
+ (define (char i)
+ (string-append "\\char" (inexact->string i 10) " "))
+
+ (define (decrescendo thick w h cont)
+ (embedded-ps ((ps-scm 'decrescendo) thick w h cont)))
+ ;This sets CTM so that you get to the currentpoint
+ ; by executing a 0 0 moveto
+
(define (embedded-ps s)
(string-append "\\embeddedps{" s "}"))
(define (end-output)
"\n\\EndLilyPondOutput")
- (define (experimental-on) "\\turnOnExperimentalFeatures")
-
- (define (extender h)
- (invoke-dim1 "extender" h))
-
- (define
- (fatdoublebar h)
- (invoke-dim1 "fatdoublebar" h))
-
- (define
- (finishbar h)
- (invoke-dim1 "finishbar" h))
+ (define (experimental-on)
+ "")
(define (font-switch i)
(string-append
(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) "\\turnOnPostScript")
+ (define (header-end)
+ (string-append
+ "\\special{! "
+ (ly-gulp-file "lily.ps")
+ ;; breaks on ppc
+;; (regexp-substitute/global #f "\n" (ly-gulp-file "lily.ps") 'pre " %\n" 'post)
+ "}"
+ "\\input lilyponddefs \\turnOnPostScript"))
(define (header creator generate)
(string-append
(define (invoke-char s i)
(string-append
"\n\\" s "{" (inexact->string i 10) "}" ))
- (define (char i)
- (string-append "\\show{" (inexact->string i 10) "}"))
-
+
(define (invoke-dim1 s d)
(string-append
"\n\\" s "{" (number->dim d) "}"))
;;
;; 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
+ (regexp-substitute/global #f "\\\\" s 'pre "$\\backslash$" 'post)
+ s))
+
(define (lily-def key val)
(string-append
- "\\def\\" (output-tex-string key) "{" (output-tex-string val) "}\n"))
+ "\\def\\"
+; (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 "))
+ (number->string (chop-decimal 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 (/ (- (min y (- maxht step)) minht) step)) "}"))
-
- (define
- (repeatbar h)
- (invoke-dim1 "repeatbar" h))
-
- (define
- (repeatbarstartrepeat h)
- (invoke-dim1 "repeatbarstartrepeat" h))
-
- (define (rulesym h w)
- (string-append
- "\\vrule height " (number->dim (/ h 2))
- " depth " (number->dim (/ h 2))
- " width " (number->dim w)
- )
+ ;;;;
+ (define (pianobrace y staffht)
+ (let* ((step 1.0)
+ (minht (* 2 staffht))
+ (maxht (* 7 minht))
+ )
+ (string-append
+ (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))) 0)
+ (char (max 0 (/ (- (min y (- maxht step)) minht) step))))
+ )
)
- (define (slur l)
- (embedded-ps ((ps-scm 'slur) l)))
- (define
- (startbar h)
- (invoke-dim1 "startbar" h))
+ (define (bezier-sandwich l thick)
+ (embedded-ps ((ps-scm 'bezier-sandwich) l thick)))
- (define
- (startrepeat h)
- (invoke-dim1 "startrepeat" h))
- (define (start-line)
- (string-append
- "\\hbox{%\n")
+ (define (start-line ht)
+ (begin
+ (clear-fontcache)
+ (string-append"\\vbox to " (number->dim ht) "{\\hbox{%\n"))
)
-
- (define (filledbox breapth width height depth)
+ (define (stop-line)
+ "}\\vss}\\interscoreline")
+ (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 (stop-line)
- "}\\interscoreline")
-
- (define
- (stoprepeat h)
- (invoke-dim1 "stoprepeat" h))
-
- (define (text f s)
- (string-append "\\set" f "{" (output-tex-string s) "}"))
+ (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)))
- (define (maatstreep h)
- (string-append "\\maatstreep{" (number->dim h) "}"))
-
- ; urg: generate me
+ ;; 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 beam ,beam)
- (define tuplet ,tuplet)
+ (define bezier-sandwich ,bezier-sandwich)
(define bracket ,bracket)
+ (define char ,char)
(define crescendo ,crescendo)
(define dashed-slur ,dashed-slur)
- (define doublebar ,doublebar)
- (define emptybar ,emptybar)
(define decrescendo ,decrescendo)
- (define empty ,empty)
(define end-output ,end-output)
- (define extender ,extender)
- (define fatdoublebar ,fatdoublebar)
- (define finishbar ,finishbar)
+ (define experimental-on ,experimental-on)
+ (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 repeatbar ,repeatbar)
- (define repeatbarstartrepeat ,repeatbarstartrepeat)
- (define rulesym ,rulesym)
- (define slur ,slur)
- (define startbar ,startbar)
- (define startrepeat ,startrepeat)
- (define stoprepeat ,stoprepeat)
+ (define select-font ,select-font)
(define start-line ,start-line)
- (define filledbox ,filledbox)
(define stop-line ,stop-line)
+ (define stop-last-line ,stop-last-line)
(define text ,text)
- (define experimental-on ,experimental-on)
- (define char ,char)
- (define maatstreep ,maatstreep)
- (define pianobrace ,pianobrace)
+ (define tuplet ,tuplet)
(define volta ,volta)
))
- ((eq? action-name 'experimental-on) experimental-on)
((eq? action-name 'beam) beam)
((eq? action-name 'tuplet) tuplet)
((eq? action-name 'bracket) bracket)
((eq? action-name 'crescendo) crescendo)
((eq? action-name 'dashed-slur) dashed-slur)
- ((eq? action-name 'doublebar) doublebar)
((eq? action-name 'decrescendo) decrescendo)
- ((eq? action-name 'empty) empty)
((eq? action-name 'end-output) end-output)
- ((eq? action-name 'extender) extender)
- ((eq? action-name 'fatdoublebar) fatdoublebar)
- ((eq? action-name 'finishbar) finishbar)
+ ((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 'repeatbar) repeatbar)
- ((eq? action-name 'repeatbarstartrepeat) repeatbarstartrepeat)
- ((eq? action-name 'rulesym) rulesym)
- ((eq? action-name 'slur) slur)
- ((eq? action-name 'startbar) startbar)
- ((eq? action-name 'startrepeat) startrepeat)
- ((eq? action-name 'stoprepeat) stoprepeat)
+ ((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 magnification)
+ (define font-cmd (assoc font-name font-alist))
+ (if (not (equal? font-name current-font))
+ (begin
+ (set! current-font font-name)
+ (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 "
+ (mag-to-size magnification)
+ " scalefont setfont} bind def \n"
+ font-cmd " \n"))
+ (string-append (cdr font-cmd) " ")))
+ ; font-name == current-font no switch needed
+ ""
+ ))
+
(define (beam width slope thick)
(string-append
- (numbers->string (list width slope thick)) " draw_beam " ))
+ (numbers->string (list width slope thick)) " draw_beam" ))
(define (bracket h)
- (invoke-dim1 "draw_bracket" h))
+ (invoke-dim1 " draw_bracket" h))
+
+ (define (char 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"))
(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") " "
+ (if (> 1 dash)
+ (number->string (- (* thick dash) thick))
+ "0")
+ " "
(number->string (* 2 thick))
" ] 0 draw_dashed_slur"))
- (define (decrescendo w h cont)
+ (define (decrescendo thick w h cont)
(string-append
- (numbers->string (list w h (inexact->exact cont)))
- "draw_decrescendo"))
+ (numbers->string (list w h (inexact->exact cont) thick))
+ " draw_decrescendo"))
- (define (empty)
- "\n empty\n")
(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"))
+ " 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"))
+ (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 ))
(string-append
(number->string x) " " (number->string y) " {" s "} placebox "))
- (define (rulesym x y)
- (string-append
- (number->string x) " "
- (number->string y) " "
- "rulesym"))
-
- (define (slur l)
- (string-append
- (apply string-append (map control->string l))
- " draw_slur"))
+ (define (pianobrace y staffht)
+ (let* ((step 1.0)
+ (minht (* 2 staffht))
+ (maxht (* 7 minht))
+ )
+ (string-append
+ (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))) 0)
+ (char (max 0 (/ (- (min y (- maxht step)) minht) step))))
+ )
+ )
- (define (start-line)
- "\nstart_line {\n")
- (define (stem kern width height depth)
- (string-append (numbers->string (list kern width height depth))
- "draw_stem" ))
+ (define (bezier-sandwich l thick)
+ (string-append
+ (apply string-append (map control->string l))
+ (number->string thick)
+ " draw_bezier_sandwich"))
+
+ (define (start-line height)
+ (begin
+ (clear-fontcache)
+ "\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 (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)
"\n unknown\n")
- ; dispatch on action-name
+ ;; 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 slur ,slur)
+ (define bezier-sandwich ,bezier-sandwich)
(define dashed-slur ,dashed-slur)
(define decrescendo ,decrescendo)
- (define empty ,empty)
(define end-output ,end-output)
+ (define experimental-on ,experimental-on)
+ (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 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)
((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 'volta) volta)
- ((eq? action-name 'slur) slur)
((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))
)
)
-
+ ;
+; 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)))))
+
+
+;;;; print a SCM expression. Isn't this part of the std lib?
+
+(define (scmlist->string exp)
+ (cond
+ ((pair? (cdr exp)) (string-append (scm->string (car exp)) " " (scmlist->string (cdr exp))))
+ ((eq? '() (cdr exp)) (string-append (scm->string (car exp)) ")"))
+ (else (string-append (scm->string (car exp)) " . " (scm->string (cdr exp)) ")"))
+ ))
+
+(define (scm->string exp)
+ (cond
+ ((pair? exp) (string-append "(" (scmlist->string exp)))
+ ((number? exp) (number->string exp))
+ ((symbol? exp) (symbol->string exp))
+ ((string? exp) (string-append "\"" exp "\""))
+ ))
+
+(define (test-scm->string)
+(list (scmlist->string '(a))
+(scmlist->string '(a b))
+(scmlist->string '(a b . c))
+(scm->string '(a))
+(scm->string '(a b ))
+(scm->string '(a b . c))
+(scm->string '(a b (c . d)))
+(scm->string '(a "bla" (c . 1.5)))
+)
+)
projects / lilypond.git / blobdiff