;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
; Tablature functions, by Jiba (jiba@tuxfamily.org)
(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
)
) ) )
-(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))
+ (paper (ly:grob-paper grob))
+ (text (interpret-markup
+ paper
+ (ly:grob-alist-chain grob (ly:paper-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)
) ) )
; end of tablature functions
-(define-public (make-molecule-boxer line-thick x-padding y-padding callback)
+(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 (molecule-boxer grob)
+ (define (stencil-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)
+ (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-molecule (cons 0 line-thick) y-ext))
+ (y-rule (make-filled-box-stencil (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))
+ (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
))
- molecule-boxer
+ 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) "\""))))
;; 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))
(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
(define-public (find-notehead-symbol duration style)
(case style
((xcircle) "2xcircle")
- ((harmonic) "0neo_mensural")
+ ((harmonic) "0harmonic")
((baroque)
;; Oops, I actually would not call this "baroque", but, for
;; backwards compatibility to 1.4, this is supposed to take
(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))
("|:" . ("|" . "|:"))
("|." . ("|." . ()))
- ;; hmm... should we end with a barline here?
+ ;; hmm... should we end with a bar line here?
(".|" . ("|" . ".|"))
(":|" . (":|" . ()))
("||" . ("||" . ()))
(".|." . (".|." . ()))
("" . ("" . ""))
+ (":" . (":" . ""))
("empty" . (() . ()))
("brace" . (() . "brace"))
("bracket" . (() . "bracket"))
(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)
+ ))
projects / lilypond.git / blobdiff