;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
(ly-warn (string-append
"Programming error: No such font known "
(car name-mag-pair) " "
- (number->string (cdr name-mag-pair))
+ (ly-number->string (cdr name-mag-pair))
))
"") ; issue no command
" { /"
(car name-mag)
" findfont "
- "12 " (number->string (cdr name-mag)) " mul "
+ "12 " (ly-number->string (cdr name-mag)) " mul "
"lilypondpaperoutputscale div scalefont setfont } bind def "
"\n"))
(define (comment s)
(string-append "% " s))
- (define (bracket arch_angle arch_width arch_height width height arch_thick thick)
+ (define (bracket arch_angle arch_width arch_height height arch_thick thick)
(string-append
- (numbers->string (list arch_angle arch_width arch_height width height arch_thick thick)) " draw_bracket" ))
+ (numbers->string (list arch_angle arch_width arch_height 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"))
+ (define (hairpin thick width starth endh )
+ (string-append
+ (numbers->string (list width starth endh thick))
+ " draw_hairpin"))
+
;; what the heck is this interface ?
(define (dashed-slur thick dash l)
(string-append
(apply string-append (map control->string l))
- (number->string thick)
+ (ly-number->string thick)
" [ "
- (number->string dash)
+ (ly-number->string dash)
" "
- (number->string (* 10 thick)) ;UGH. 10 ?
+ (ly-number->string (* 10 thick)) ;UGH. 10 ?
" ] 0 draw_dashed_slur"))
(define (dashed-line thick on off dx dy)
(string-append
- (number->string dx)
+ (ly-number->string dx)
" "
- (number->string dy)
+ (ly-number->string dy)
" "
- (number->string thick)
+ (ly-number->string thick)
" [ "
- (number->string on)
+ (ly-number->string on)
" "
- (number->string off)
+ (ly-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 (repeat-slash wid slope thick)
+ (string-append (numbers->string (list wid slope thick))
+ " draw_repeat_slash"))
+
(define (end-output)
- "\nshowpage\n")
+ "\nend-lilypond-output\n")
(define (experimental-on) "")
(define (filledbox breapth width depth height)
(string-append (numbers->string (list breapth width depth height))
- " draw_box" ))
+ " draw-box" ))
;; obsolete?
(define (font-def i s)
;; 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")
+ (ly-gulp-file "music-drawing-routines.ps")
"{ exch pop //systemdict /run get exec } "
))
(define (invoke-dim1 s d)
(string-append
- (number->string (* d (/ 72.27 72))) " " s ))
+ (ly-number->string (* d (/ 72.27 72))) " " s ))
(define (placebox x y s)
(string-append
- (number->string x) " " (number->string y) " {" s "} placebox "))
+ (ly-number->string x) " " (ly-number->string y) " {" s "} place-box\n"))
(define (bezier-sandwich l thick)
(string-append
(apply string-append (map control->string l))
- (number->string thick)
+ (ly-number->string thick)
" draw_bezier_sandwich"))
+; TODO: use HEIGHT argument
(define (start-line height)
- "\nstart_line {
+ (string-append
+ "\n"
+ (ly-number->string height)
+ " start-line {
lilypondpaperoutputscale lilypondpaperoutputscale scale
-")
+"))
(define (stem breapth width depth height)
(string-append (numbers->string (list breapth width depth height))
- " draw_box" ))
+ " draw-box" ))
(define (stop-line)
- "}\nstop_line\n")
+ "}\nstop-line\n")
(define (text s)
(string-append "(" s ") show "))
(define (unknown)
"\n unknown\n")
+ (define (ez-ball ch letter-col ball-col)
+ (string-append
+ " (" ch ") "
+ (numbers->string (list letter-col ball-col))
+ " /Helvetica-Bold " ;; ugh
+ " draw_ez_ball"))
(define (define-origin a b c ) "")
(define (no-origin) "")
(define tuplet ,tuplet)
(define bracket ,bracket)
(define char ,char)
- (define crescendo ,crescendo)
+ (define hairpin ,hairpin)
(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 stem ,stem)
(define stop-line ,stop-line)
(define stop-last-line ,stop-line)
+ (define repeat-slash ,repeat-slash)
(define text ,text)
(define no-origin ,no-origin)
(define define-origin ,define-origin)
+ (define ez-ball ,ez-ball)
))
+ ((eq? action-name 'repeat-slash) repeat-slash)
((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 'hairpin) hairpin)
((eq? action-name 'experimental-on) experimental-on)
((eq? action-name 'filledbox) filledbox)
+ ((eq? action-name 'ez-ball) ez-ball)
((eq? action-name 'select-font) select-font)
((eq? action-name 'volta) volta)
(else (error "unknown tag -- PS-SCM " action-name))
projects / lilypond.git / blobdiff