X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-lib.scm;h=fbc4cfd8ad86945e55e1e322385be7c624ff5395;hb=414b03f31a4abc0de62d7909facd5fdbdde0bad6;hp=8db3a6f1f6ac689a7e20f0ef15f63fa002982ce9;hpb=fd8ed70c80d71a3bc6e0e62cc86a3659e23eb0a2;p=lilypond.git diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 8db3a6f1f6..fbc4cfd8ad 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2001 Jan Nieuwenhuizen +;;;; (c) 1998--2003 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ; Tablature functions, by Jiba (jiba@tuxfamily.org) @@ -16,8 +16,8 @@ ; Create a text molecule (define-public (tablature-molecule-callback grob) (let ((molecule (fontify-text - (ly-get-default-font grob) - (ly-get-grob-property grob 'text) + (ly:get-default-font grob) + (ly:get-grob-property grob 'text) ))) molecule ; return the molecule. ) @@ -27,7 +27,7 @@ ; Compute the text grob-property (define-public (fret-number-tablature-format string tuning pitch) (number->string - (- (pitch-semitones pitch) + (- (ly:pitch-semitones pitch) (list-ref tuning (- string 1) ; remove 1 because list index starts at 0 and guitar string at 1. ) @@ -36,30 +36,30 @@ ) (define-public (hammer-molecule-callback grob) - (let* ((note-collums (ly-get-grob-property grob 'note-columns)) + (let* ((note-collums (ly:get-grob-property grob 'note-columns)) (note-column1 (cadr note-collums)) (note-column2 (car note-collums)) - (note1 (car (ly-get-grob-property note-column1 'note-heads))) - (note2 (car (ly-get-grob-property note-column2 'note-heads))) - (fret1 (string->number (ly-get-grob-property note1 'text))) - (fret2 (string->number (ly-get-grob-property note2 'text))) + (note1 (car (ly:get-grob-property note-column1 'note-heads))) + (note2 (car (ly:get-grob-property note-column2 'note-heads))) + (fret1 (string->number (ly:get-grob-property note1 'text))) + (fret2 (string->number (ly:get-grob-property note2 'text))) (letter (if (< fret1 fret2) "H" (if (> fret1 fret2) "P" ""))) ) (let ((slur (Slur::brew_molecule grob)) - (text (fontify-text (ly-get-default-font grob) letter))) + (text (fontify-text (ly:get-default-font grob) letter))) - (let ((x (/ (- (cdr (ly-get-molecule-extent slur 0)) - (/ (cdr (ly-get-molecule-extent text 0)) 2.0) + (let ((x (/ (- (cdr (ly:molecule-get-extent slur 0)) + (/ (cdr (ly:molecule-get-extent text 0)) 2.0) ) -2.0))) - (ly-set-molecule-extent! text 0 (cons x x)) - (ly-align-to! text 0 1) + (ly:molecule-set-extent! text 0 (cons x x)) + (ly:molecule-align-to! text 0 1) ) - - (ly-combine-molecule-at-edge slur 1 1 text -0.6) + + (ly:molecule-combine-at-edge slur 1 1 text -0.6) ) ) ) @@ -77,48 +77,45 @@ (let* ( (mol (callback grob)) - (x-ext (widen-interval (ly-get-molecule-extent mol 0) x-padding)) - (y-ext (widen-interval (ly-get-molecule-extent mol 1) y-padding)) + (x-ext (widen-interval (ly:molecule-get-extent mol 0) x-padding)) + (y-ext (widen-interval (ly:molecule-get-extent mol 1) y-padding)) (x-rule (box-molecule (widen-interval x-ext line-thick) (cons 0 line-thick))) (y-rule (box-molecule (cons 0 line-thick) y-ext)) ) - (set! mol (ly-combine-molecule-at-edge mol 0 1 y-rule x-padding)) - (set! mol (ly-combine-molecule-at-edge mol 0 -1 y-rule x-padding)) - (set! mol (ly-combine-molecule-at-edge mol 1 1 x-rule 0)) - (set! mol (ly-combine-molecule-at-edge mol 1 -1 x-rule 0)) + (set! mol (ly:molecule-combine-at-edge mol 0 1 y-rule x-padding)) + (set! mol (ly:molecule-combine-at-edge mol 0 -1 y-rule x-padding)) + (set! mol (ly:molecule-combine-at-edge mol 1 1 x-rule 0)) + (set! mol (ly:molecule-combine-at-edge mol 1 -1 x-rule 0)) mol )) molecule-boxer ) - -(define (arg->string arg) +(define-public (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) +(define-public (func name . args) + (string-append + "(" name + (if (null? args) "" - (apply string-append + (apply string-append (map (lambda (x) (string-append " " (arg->string x))) args))) ")\n")) - ;;(define (mm-to-pt x) ;; (* (/ 72.27 25.40) x)) ;; do nothing in .scm output -(define (comment s) "") +(define-public (comment s) "") -(define (numbers->string l) - (apply string-append (map ly-number->string l))) +(define-public (numbers->string l) + (apply string-append (map ly:number->string l))) ; (define (chop-decimal x) (if (< (abs x) 0.001) 0.0 x)) @@ -131,12 +128,12 @@ (number->string n8) (number->string (remainder (- n (+ (* n64 64) (* n8 8))) 8))))) -(define (inexact->string x radix) +(define-public (inexact->string x radix) (let ((n (inexact->exact x))) (number->string n radix))) -(define (control->string c) +(define-public (number-pair->string c) (string-append (number->string (car c)) " " (number->string (cdr c)) " ")) @@ -150,7 +147,7 @@ ;; silly, use alist? -(define (find-notehead-symbol duration style) +(define-public (find-notehead-symbol duration style) (case style ((xcircle) "2xcircle") ((harmonic) "0neo_mensural") @@ -213,7 +210,7 @@ centered, X==1 is at the right, X == -1 is at the left." '(1.0 . 0.0) ))) -(define (string-encode-integer i) +(define-public (string-encode-integer i) (cond ((= i 0) "o") ((< i 0) (string-append "n" (string-encode-integer (- i)))) @@ -222,6 +219,60 @@ centered, X==1 is at the right, X == -1 is at the left." (string-encode-integer (quotient i 26)))))) -(define ((every-nth-bar-number-visible n) barnum) (= 0 (modulo barnum n))) +(define-public ((every-nth-bar-number-visible n) barnum) (= 0 (modulo barnum n))) + +(define-public ((modulo-bar-number-visible n m) barnum) (and (> barnum 1) (= m (modulo barnum n)))) + +(define-public ((set-bar-number-visibility n) tr) + (let* ((bn (ly:get-context-property tr 'currentBarNumber))) + (ly:set-context-property tr 'barNumberVisibility (modulo-bar-number-visible n (modulo bn n)))) +) (define-public (default-bar-number-visibility barnum) (> barnum 1)) + +;; See documentation of Item::visibility_lambda_ +(define-public (begin-of-line-visible d) (if (= d 1) '(#f . #f) '(#t . #t))) +(define-public (end-of-line-visible d) (if (= d -1) '(#f . #f) '(#t . #t))) +(define-public (spanbar-begin-of-line-invisible d) (if (= d -1) '(#t . #t) '(#f . #f))) + +(define-public (all-visible d) '(#f . #f)) +(define-public (all-invisible d) '(#t . #t)) +(define-public (begin-of-line-invisible d) (if (= d 1) '(#t . #t) '(#f . #f))) +(define-public (end-of-line-invisible d) (if (= d -1) '(#t . #t) '(#f . #f))) + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Bar lines. + +; +; How should a bar line behave at a break? +; +;; Why prepend `default-' to every scm identifier? +(define-public (default-break-barline glyph dir) + (let ((result (assoc glyph + '((":|:" . (":|" . "|:")) + ("||:" . ("||" . "|:")) + ("|" . ("|" . ())) + ("||:" . ("||" . "|:")) + ("|s" . (() . "|")) + ("|:" . ("|" . "|:")) + ("|." . ("|." . ())) + + ;; hmm... should we end with a barline here? + (".|" . ("|" . ".|")) + (":|" . (":|" . ())) + ("||" . ("||" . ())) + (".|." . (".|." . ())) + ("" . ("" . "")) + ("empty" . (() . ())) + ("brace" . (() . "brace")) + ("bracket" . (() . "bracket")) + ) + ))) + + (if (equal? result #f) + (ly:warn (string-append "Unknown bar glyph: `" glyph "'")) + (index-cell (cdr result) dir)) + ) + ) +