X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-lib.scm;h=ee90e06bd3631e8e2619e73a26e1a9f6df371c76;hb=5d7c09ae841d7d341603e320b810a9740200c8c1;hp=3ca97b267a34989cd5c1fe14e285c7c980f917ff;hpb=569f6d76cb725b6d99b4239719d453fdf232b9ab;p=lilypond.git diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 3ca97b267a..ee90e06bd3 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--2003 Jan Nieuwenhuizen +;;;; (c) 1998--2004 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ; Tablature functions, by Jiba (jiba@tuxfamily.org) @@ -11,15 +11,6 @@ (define (tablature-stem-attachment-function style duration) (cons 0.0 0.5)) -; The TabNoteHead molecule callback. -; 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) - ))) - molecule ; return the molecule. - )) ; The TabNoteHead tablatureFormat callback. ; Compute the text grob-property @@ -29,33 +20,47 @@ (list-ref tuning (- string 1) ; remove 1 because list index starts at 0 and guitar string at 1. ) - ) ) ) + ))) -(define-public (hammer-molecule-callback grob) - (let* ((note-collums (ly:get-grob-property grob 'note-columns)) +(define-public (hammer-print-function grob) + (let* ((note-collums (ly: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))) - (letter (if (< fret1 fret2) "H" - (if (> fret1 fret2) "P" - ""))) + (note1 (car (ly:grob-property note-column1 'note-heads))) + (note2 (car (ly:grob-property note-column2 'note-heads))) + (text1 (ly:grob-property note1 'text)) + (text2 (ly:grob-property note2 'text)) + (fret1 (if (string? text1) (string->number text1) 0)) + (fret2 (if (string? text2) (string->number text2) 0)) + (letter (cond + ((< fret1 fret2) "H") + ((> fret1 fret2) "P") + (else ""))) + ) - (let ((slur (Slur::brew_molecule grob)) - (text (fontify-text (ly:get-default-font grob) letter))) + (let* ( + (slur ; (Slur::print grob) + + ;; + ;; FIXME: a hammer is not a slur. + ;; + (ly:make-stencil '() '(0 . 0) '(0 . 0))) + (paper (ly:grob-paper grob)) + (text (interpret-markup + paper + (ly:grob-alist-chain grob (ly:output-def-lookup paper 'text-font-defaults)) + letter))) - (let ((x (/ (- (cdr (ly:molecule-get-extent slur 0)) - (/ (cdr (ly:molecule-get-extent text 0)) 2.0) + (let ((x (/ (- (cdr (ly:stencil-extent slur 0)) + (/ (cdr (ly:stencil-extent text 0)) 2.0) ) -2.0))) - (ly:molecule-set-extent! text 0 (cons x x)) - (ly:molecule-align-to! text 0 1) + (ly:stencil-set-extent! text 0 (cons x x)) + (ly:stencil-align-to! text 0 1) ) - (ly:molecule-combine-at-edge slur 1 1 text -0.6) +; (ly:stencil-combine-at-edge slur 1 1 text -0.6) ) ) ) @@ -65,31 +70,29 @@ ; end of tablature functions -(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 (interval-widen (ly:molecule-get-extent mol 0) x-padding)) - (y-ext (interval-widen (ly:molecule-get-extent mol 1) y-padding)) - (x-rule (make-filled-box-molecule (interval-widen x-ext line-thick) - (cons 0 line-thick))) - (y-rule (make-filled-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 (make-stencil-boxer line-thick x-padding y-padding callback) + "Makes a routine that adds a box around the grob parsed as argument" + (define (stencil-boxer grob) + (let* + ( + (mol (callback grob)) + (x-ext (interval-widen (ly:stencil-extent mol 0) x-padding)) + (y-ext (interval-widen (ly:stencil-extent mol 1) y-padding)) + (x-rule (make-filled-box-stencil (interval-widen x-ext line-thick) + (cons 0 line-thick))) + (y-rule (make-filled-box-stencil (cons 0 line-thick) y-ext)) + ) + + (set! mol (ly:stencil-combine-at-edge mol 0 1 y-rule x-padding)) + (set! mol (ly:stencil-combine-at-edge mol 0 -1 y-rule x-padding)) + (set! mol (ly:stencil-combine-at-edge mol 1 1 x-rule 0)) + (set! mol (ly:stencil-combine-at-edge mol 1 -1 x-rule 0)) + + mol)) + stencil-boxer) (define-public (arg->string arg) - (cond ((number? arg) (inexact->string arg 10)) + (cond ((number? arg) (ly:inexact->string arg 10)) ((string? arg) (string-append "\"" arg "\"")) ((symbol? arg) (string-append "\"" (symbol->string arg) "\"")))) @@ -106,12 +109,9 @@ ;; (* (/ 72.27 25.40) x)) ;; do nothing in .scm output -(define-public (comment s) "") -(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)) +(define-public (ly:numbers->string lst) + (string-join (map ly:number->string lst) " ")) (define (number->octal-string x) (let* ((n (inexact->exact x)) @@ -122,14 +122,13 @@ (number->string n8) (number->string (remainder (- n (+ (* n64 64) (* n8 8))) 8))))) -(define-public (inexact->string x radix) +(define-public (ly:inexact->string x radix) (let ((n (inexact->exact x))) (number->string n radix))) - -(define-public (number-pair->string c) +(define-public (ly:number-pair->string c) (string-append (ly:number->string (car c)) " " - (ly:number->string (cdr c)) " ")) + (ly:number->string (cdr c)))) (define (font i) (string-append @@ -197,8 +196,8 @@ centered, X==1 is at the right, X == -1 is at the left." (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))))) + (let* ((bn (ly:context-property tr 'currentBarNumber))) + (ly:context-set-property! tr 'barNumberVisibility (modulo-bar-number-visible n (modulo bn n))))) (define-public (default-bar-number-visibility barnum) (> barnum 1)) @@ -230,7 +229,7 @@ centered, X==1 is at the right, X == -1 is at the left." ("|:" . ("|" . "|:")) ("|." . ("|." . ())) - ;; hmm... should we end with a barline here? + ;; hmm... should we end with a bar line here? (".|" . ("|" . ".|")) (":|" . (":|" . ())) ("||" . ("||" . ())) @@ -244,8 +243,14 @@ centered, X==1 is at the right, X == -1 is at the left." ))) (if (equal? result #f) - (ly:warn (string-append "Unknown bar glyph: `" glyph "'")) + (ly:warn "Unknown bar glyph: `~S'" glyph) (index-cell (cdr result) dir)) ) ) + +(define-public (shift-right-at-line-begin g) + "Shift an item to the right, but only at the start of the line." + (if (and (ly:item? g) (equal? (ly:item-break-dir g) RIGHT)) + (ly:grob-translate-axis! g 3.5 X) + ))