(("" "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 3.5))
- (("Key_item" "Time_signature") . (extra_space 2.0))
+ (("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))
(("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 2.0))
- (("Time_signature" "begin-of-note") . (extra_space 1.0)) ; Huh? see twinkle.ly
+ (("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))
)
)
-
-
(define (break-align-spacer this next)
(let ((entry (assoc `(,this ,next) space-alist)))
(if entry
(string-append
"\\lilyfont"
(make-string 1 (integer->char (+ 65 i)))))
-
- (define (select-font font-name)
+
+ (define (select-font font-name magnification)
(if (not (equal? font-name current-font))
- (begin
+ (let* ((font-cmd (assoc font-name font-alist)))
(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-count (+ 1 font-count))
(if (equal? font-name "")
(error "Empty fontname -- SELECT-FONT"))
- (string-append "\\font" font-cmd "=" font-name font-cmd))
+ (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 (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 "\\char" (inexact->string i 10) " "))
- (define (decrescendo w h cont)
- (embedded-ps ((ps-scm 'decrescendo) w h cont)))
+ (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 "\\special{ps: @beginspecial @setspecial " s " @endspecial}"))
+ (string-append "\\embeddedps{" s "}"))
(define (end-output)
"\n\\EndLilyPondOutput")
(string-append
"\\font" (font-switch i) "=" s "\n"))
- ;; UGH
-
- (define (header-end) (string-append
-"\\special{!"
-"/stafflinethickness \\mudelapaperstaffline0 def " ;may we burn in hell.
-"/interline \\mudelapaperinterline0 %\n def "
-"interline 3 div /bracket_b exch def "
-"interline 2 mul /bracket_w exch def "
-"stafflinethickness 2 mul /bracket_t exch def "
-"interline 1.5 mul /bracket_v exch def "
-"bracket_v /bracket_u exch def "
-"50 /bracket_alpha exch def "
-"1 setlinecap}"))
+ (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
;;
;; 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
(maxht (* 7 minht))
)
(string-append
- (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))))
+ (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))) 0)
(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 thick)
(embedded-ps ((ps-scm 'bezier-sandwich) l thick)))
(define (tuplet ht gapx dx dy thick dir)
(embedded-ps ((ps-scm 'tuplet) ht gapx dx dy thick dir)))
- (define (volta h w thick last)
- (embedded-ps ((ps-scm 'volta) h 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.
(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)
((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)
(string-append
"lilyfont"
(make-string 1 (integer->char (+ 65 i)))))
-
- (define (select-font font-name)
+
+ (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)
(if (not (equal? font-name current-font))
(begin
(set! current-font font-name)
(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-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))
(define (char i)
(invoke-char " show" i))
- (define (crescendo w h cont thick)
+ (define (crescendo thick w h cont )
(string-append
(numbers->string (list w h (inexact->exact cont) thick))
" draw_crescendo"))
(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 (font-switch i)
(string-append (font i) " "))
- (define (header-end) "")
+ (define (header-end)
+ (string-append
+ (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")
(maxht (* 7 minht))
)
(string-append
- (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))))
+ (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))) 0)
(char (max 0 (/ (- (min y (- maxht step)) minht) step))))
)
)
- (define (rulesym x y)
- (string-append
- (number->string x) " "
- (number->string y) " "
- " rulesym"))
-
(define (bezier-sandwich l thick)
(string-append
(apply string-append (map control->string l))
(string-append "(" s ") show "))
- (define (volta h w thick last)
+ (define (volta h w thick vert_start vert_end)
(string-append
- (numbers->string (list h w thick (inexact->exact last)))
+ (numbers->string (list h w thick (inexact->exact vert_start) (inexact->exact vert_end)))
" draw_volta"))
(define (tuplet ht gap dx dy thick dir)
(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)
projects / lilypond.git / blobdiff