X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-lib.scm;h=fbc4cfd8ad86945e55e1e322385be7c624ff5395;hb=414b03f31a4abc0de62d7909facd5fdbdde0bad6;hp=58ec903adc5d970595058ae04b92fb4b599116df;hpb=818b830dd1b600e497cb034b4727c97ad6ee7765;p=lilypond.git diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 58ec903adc..fbc4cfd8ad 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -2,22 +2,22 @@ ;;;; ;;;; 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) ; The TabNoteHead stem attachment function. (define (tablature-stem-attachment-function style duration) - (cons 0.0 1.0) + (cons 0.0 0.5) ;; UGH! ) ; The TabNoteHead molecule callback. ; Create a text molecule -(define (tablature-molecule-callback grob) +(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. ) @@ -25,9 +25,9 @@ ; The TabNoteHead tablatureFormat callback. ; Compute the text grob-property -(define (fret-number-tablature-format string tuning pitch) +(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. ) @@ -35,65 +35,87 @@ ) ) -(define (hammer-molecule-callback grob) - (let* ((note-collums (ly-get-grob-property grob 'note-columns)) +(define-public (hammer-molecule-callback grob) + (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) ) ) ) +(define-public guitar-tunings '(4 -1 -5 -10 -15 -20)) ; end of tablature functions -(define (arg->string arg) +(define-public (make-molecule-boxer line-thick x-padding y-padding callback) + "Makes a routine that adds a box around the grob parsed as argument" + (define (molecule-boxer grob) + (let* + ( + (mol (callback grob)) + (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: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-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)) @@ -106,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)) " ")) @@ -125,24 +147,22 @@ ;; silly, use alist? -(define (find-notehead-symbol duration style) +(define-public (find-notehead-symbol duration style) (case style - ((xcircle) (cons "2xcircle" "music")) - ((harmonic) (cons "0neo_mensural" "music")) + ((xcircle) "2xcircle") + ((harmonic) "0neo_mensural") ((baroque) ;; Oops, I actually would not call this "baroque", but, for ;; backwards compatibility to 1.4, this is supposed to take ;; brevis, longa and maxima from the neo-mensural font and all ;; other note heads from the default font. -- jr (if (< duration 0) - (cons (string-append (number->string duration) "neo_mensural") "ancient") - (cons (number->string duration) "music"))) + (string-append (number->string duration) "neo_mensural") + (number->string duration))) ((mensural) - (cons (string-append (number->string duration) (symbol->string style)) - "ancient")) + (string-append (number->string duration) (symbol->string style))) ((neo_mensural) - (cons (string-append (number->string duration) (symbol->string style)) - "ancient")) + (string-append (number->string duration) (symbol->string style))) ((default) ;; The default font in mf/feta-bolletjes.mf defines a brevis, but ;; neither a longa nor a maxima. Hence let us, for the moment, @@ -151,11 +171,13 @@ ;; should look exactly like the brevis of the default font, but ;; with a stem exactly like that of the quarter note. -- jr (if (< duration -1) - (cons (string-append (number->string duration) "neo_mensural") "ancient") - (cons (number->string duration) "music"))) + (string-append (number->string duration) "neo_mensural") + (number->string duration))) (else - (cons (string-append (number->string (max 0 duration)) (symbol->string style)) - "music")))) + (if (string-match "vaticana*|hufnagel*|medicaea*" (symbol->string style)) + (symbol->string style) + (string-append (number->string (max 0 duration)) + (symbol->string style)))))) (define (note-head-style->attachment-coordinates style duration) @@ -188,44 +210,7 @@ centered, X==1 is at the right, X == -1 is at the left." '(1.0 . 0.0) ))) -(define (find-timesig-symbol nom denom style) - (case style - ((mensural) - (cons (string-append - "mensural" - (number->string nom) - "/" - (number->string denom)) - "ancient")) - ((neo_mensural) - (cons (string-append - "neo_mensural" - (number->string nom) - "/" - (number->string denom)) - "ancient")) - ((numbered) - (cons (string-append - (number->string nom) - "/" - (number->string denom)) - "music")) - (else - ;; default: use "C" style when possible, otherwise return "" - (cons - (case nom - ((2) - (case denom - ((2) "C2/2") - (else ""))) - ((4) - (case denom - ((4) "C4/4") - (else ""))) - (else "")) - "music")))) - -(define (string-encode-integer i) +(define-public (string-encode-integer i) (cond ((= i 0) "o") ((< i 0) (string-append "n" (string-encode-integer (- i)))) @@ -234,6 +219,60 @@ centered, X==1 is at the right, X == -1 is at the left." (string-encode-integer (quotient i 26)))))) +(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)) + ) + ) +