-;;;
-;;; chord-name.scm -- chord name utility functions
-;;;
-;;; source file of the GNU LilyPond music typesetter
-;;;
-;;; (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;
-;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; chord-name.scm -- chord name utility functions
+;;;;
+;;;; source file of the GNU LilyPond music typesetter
+;;;;
+;;;; (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
(define (natural-chord-alteration p)
"Return the natural alteration for step P."
(if (= (ly:pitch-steps p) 6)
- -1
+ FLAT
0))
-
+;;
+;; TODO: make into markup.
+;;
(define-public (alteration->text-accidental-markup alteration)
+
(make-smaller-markup
(make-raise-markup
- (if (= alteration -1)
+ (if (= alteration FLAT)
0.3
0.6)
(make-musicglyph-markup
- (string-append "accidentals-" (number->string alteration))))))
+ (assoc-get alteration standard-alteration-glyph-name-alist "")))))
(define (accidental->markup alteration)
"Return accidental markup for ALTERATION."
(make-line-markup (list empty-markup))
(conditional-kern-before
(alteration->text-accidental-markup alteration)
- (= alteration -1) 0.2
- )))
+ (= alteration FLAT) 0.2)))
+(define (accidental->markup-italian alteration)
+ "Return accidental markup for ALTERATION, for use after an italian chord root name."
+ (if (= alteration 0)
+ (make-hspace-markup 0.2)
+ (make-line-markup
+ (list
+ (make-hspace-markup (if (= alteration FLAT) 0.7 0.5))
+ (make-raise-markup 0.7 (alteration->text-accidental-markup alteration))
+ (make-hspace-markup (if (= alteration SHARP) 0.2 0.1))
+ ))))
(define-public (note-name->markup pitch)
"Return pitch markup for PITCH."
(list
(make-simple-markup
(vector-ref #("C" "D" "E" "F" "G" "A" "B") (ly:pitch-notename pitch)))
- (make-normal-size-super-markup
- (accidental->markup (ly:pitch-alteration pitch))))))
+ (accidental->markup (ly:pitch-alteration pitch)))))
+(define (pitch-alteration-semitones pitch)
+ (inexact->exact (round (* (ly:pitch-alteration pitch) 2))))
-(define-public ((chord-name->german-markup B-instead-of-Bb) pitch)
+(define-safe-public ((chord-name->german-markup B-instead-of-Bb) pitch)
"Return pitch markup for PITCH, using german note names.
If B-instead-of-Bb is set to #t real german names are returned.
Otherwise semi-german names (with Bb and below keeping the british names)
"
(let* ((name (ly:pitch-notename pitch))
- (alt (ly:pitch-alteration pitch))
- (n-a (if (member (cons name alt) '((6 . -1) (6 . -2)))
- (cons 7 (+ (if B-instead-of-Bb 1 0) alt))
- (cons name alt))))
+ (alt-semitones (pitch-alteration-semitones pitch))
+ (n-a (if (member (cons name alt-semitones) `((6 . -1) (6 . -2)))
+ (cons 7 (+ (if B-instead-of-Bb 1 0) alt-semitones))
+ (cons name alt-semitones))))
(make-line-markup
(list
(make-simple-markup
(vector-ref #("C" "D" "E" "F" "G" "A" "H" "B") (car n-a)))
(make-normal-size-super-markup
- (accidental->markup (cdr n-a)))))))
+ (accidental->markup (/ (cdr n-a) 2)))))))
-
-(define-public (note-name->german-markup pitch)
+(define-safe-public (note-name->german-markup pitch)
(let* ((name (ly:pitch-notename pitch))
- (alt (ly:pitch-alteration pitch))
- (n-a (if (member (cons name alt) '((6 . -1) (6 . -2)))
- (cons 7 (+ 1 alt))
- (cons name alt))))
+ (alt-semitones (pitch-alteration-semitones pitch))
+ (n-a (if (member (cons name alt-semitones) `((6 . -1) (6 . -2)))
+ (cons 7 (+ 1 alt-semitones))
+ (cons name alt-semitones))))
(make-line-markup
(list
(string-append
(list-ref '("c" "d" "e" "f" "g" "a" "h" "b") (car n-a))
(if (or (equal? (car n-a) 2) (equal? (car n-a) 5))
- (list-ref '( "ses" "s" "" "is" "isis") (+ 2 (cdr n-a)))
+ (list-ref '( "ses" "s" "" "is" "isis") (+ 2 (cdr n-a)))
(list-ref '("eses" "es" "" "is" "isis") (+ 2 (cdr n-a)))))))))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
+(define-public ((chord-name->italian-markup re-with-eacute) pitch)
+ "Return pitch markup for PITCH, using italian/french note names.
+ If re-with-eacute is set to #t, french 'ré' is returned for D instead of 're'
+"
+ (let* ((name (ly:pitch-notename pitch))
+ (alt (ly:pitch-alteration pitch)))
+ (make-line-markup
+ (list
+ (make-simple-markup
+ (vector-ref
+ (if re-with-eacute
+ #("Do" "Ré" "Mi" "Fa" "Sol" "La" "Si")
+ #("Do" "Re" "Mi" "Fa" "Sol" "La" "Si"))
+ name))
+ (accidental->markup-italian alt)
+ ))))
;; fixme we should standardize on omit-root (or the other one.)
-;; perhaps the default should also be reversed --hwn
-(define-public (sequential-music-to-chord-exceptions seq . rest)
- "Transform sequential music SEQ of type <<c d e>>-\markup{ foobar }
+;; perhaps the default should also be reversed --hwn
+(define-safe-public (sequential-music-to-chord-exceptions seq . rest)
+ "Transform sequential music SEQ of type <<c d e>>-\\markup{ foobar }
to (cons CDE-PITCHES FOOBAR-MARKUP), or to (cons DE-PITCHES
FOOBAR-MARKUP) if OMIT-ROOT is given and non-false.
"
(define (chord-to-exception-entry m)
- (let* ((elts (ly:get-mus-property m 'elements))
+ (let* ((elts (ly:music-property m 'elements))
(omit-root (and (pair? rest) (car rest)))
- (pitches (map (lambda (x) (ly:get-mus-property x 'pitch))
- (filter-list
+ (pitches (map (lambda (x) (ly:music-property x 'pitch))
+ (filter
(lambda (y) (memq 'note-event
- (ly:get-mus-property y 'types)))
+ (ly:music-property y 'types)))
elts)))
(sorted (sort pitches ly:pitch<?))
(root (car sorted))
;; \chords has changed to c' too?
(diff (ly:pitch-diff root (ly:make-pitch 0 0 0)))
(normalized (map (lambda (x) (ly:pitch-diff x diff)) sorted))
- (texts (map (lambda (x) (ly:get-mus-property x 'text))
- (filter-list
+ (texts (map (lambda (x) (ly:music-property x 'text))
+ (filter
(lambda (y) (memq 'text-script-event
- (ly:get-mus-property y 'types)))
+ (ly:music-property y 'types)))
elts)))
(text (if (null? texts) #f (if omit-root (car texts) texts))))
(cons (if omit-root (cdr normalized) normalized) text)))
- (define (is-req-chord? m)
+ (define (is-event-chord? m)
(and
- (memq 'event-chord (ly:get-mus-property m 'types))
- (not (equal? (ly:make-moment 0 1) (ly:get-music-length m)))))
+ (memq 'event-chord (ly:music-property m 'types))
+ (not (equal? ZERO-MOMENT (ly:music-length m)))))
- (let* ((elts (filter-list is-req-chord? (ly:get-mus-property seq 'elements)))
+ (let* ((elts (filter is-event-chord? (ly:music-property seq 'elements)))
(alist (map chord-to-exception-entry elts)))
- (filter-list (lambda (x) (cdr x)) alist)))
-
-
-(define-public (new-chord-name-brew-molecule grob)
- (let*
- (
- (ws (ly:get-grob-property grob 'word-space))
- (markup (ly:get-grob-property grob 'text))
- (molecule (interpret-markup grob
- (cons '((word-space . 0.0))
- (Font_interface::get_property_alist_chain grob))
- markup))
- )
-
- ;;
- ;; chord names aren't in staffs, so WS is in global staff space.
- (if (number? ws)
- (ly:molecule-combine-at-edge
- molecule
- X RIGHT (ly:make-molecule "" (cons 0 ws) '(-1 . 1) )
- 0.0)
- molecule)
- ))
+ (filter (lambda (x) (cdr x)) alist)))