X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fchord-name.scm;h=29ec16fc805d24ccc0cb8b57245f9d5df19eb7c5;hb=HEAD;hp=79b018992ac34650c879c3c16dfb45f29b914da5;hpb=adc6cbf9a271370c1453bfca918f810d9f2906f1;p=lilypond.git diff --git a/scm/chord-name.scm b/scm/chord-name.scm index 79b018992a..29ec16fc80 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -1,6 +1,6 @@ ;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; Copyright (C) 2000--2011 Jan Nieuwenhuizen +;;;; Copyright (C) 2000--2015 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ;;;; ;;;; LilyPond is free software: you can redistribute it and/or modify @@ -35,8 +35,8 @@ (make-smaller-markup (make-raise-markup (if (= alteration FLAT) - 0.3 - 0.6) + 0.3 + 0.6) (make-musicglyph-markup (assoc-get alteration standard-alteration-glyph-name-alist ""))))) @@ -46,7 +46,7 @@ (make-line-markup (list empty-markup)) (conditional-kern-before (alteration->text-accidental-markup alteration) - (= alteration FLAT) 0.2))) + (= alteration FLAT) 0.094725))) (define (accidental->markup-italian alteration) "Return accidental markup for ALTERATION, for use after an italian chord root name." @@ -54,10 +54,10 @@ (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)) - )))) + (make-hspace-markup (if (= alteration FLAT) 0.57285385 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 lowercase?) "Return pitch markup for @var{pitch}." @@ -73,41 +73,41 @@ (inexact->exact (round (* (ly:pitch-alteration pitch) 2)))) (define-safe-public ((chord-name->german-markup B-instead-of-Bb) - pitch lowercase?) + pitch lowercase?) "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-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)))) + (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 (conditional-string-downcase - (vector-ref #("C" "D" "E" "F" "G" "A" "H" "B") (car n-a)) - lowercase?)) + (vector-ref #("C" "D" "E" "F" "G" "A" "H" "B") (car n-a)) + lowercase?)) (make-normal-size-super-markup (accidental->markup (/ (cdr n-a) 2))))))) (define-safe-public (note-name->german-markup pitch lowercase?) (let* ((name (ly:pitch-notename pitch)) - (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)))) + (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 '("eses" "es" "" "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 lowercase?) - "Return pitch markup for @var{pitch}, using italian/french note names. +(define ((chord-name->italian-markup re-with-eacute) pitch lowercase?) + "Return pitch markup for @var{pitch}, using Italian/@/French note names. If @var{re-with-eacute} is set to @code{#t}, french `ré' is returned for pitch@tie{}D instead of `re'." @@ -117,14 +117,15 @@ pitch@tie{}D instead of `re'." (list (make-simple-markup (conditional-string-downcase - (vector-ref - (if re-with-eacute - #("Do" "Ré" "Mi" "Fa" "Sol" "La" "Si") - #("Do" "Re" "Mi" "Fa" "Sol" "La" "Si")) - name) - lowercase?)) + (vector-ref + (if re-with-eacute + #("Do" "Ré" "Mi" "Fa" "Sol" "La" "Si") + #("Do" "Re" "Mi" "Fa" "Sol" "La" "Si")) + name) + lowercase?)) (accidental->markup-italian alt) )))) +(export chord-name->italian-markup) ;; fixme we should standardize on omit-root (or the other one.) ;; perhaps the default should also be reversed --hwn @@ -136,29 +137,29 @@ FOOBAR-MARKUP) if OMIT-ROOT is given and non-false. (define (chord-to-exception-entry m) (let* ((elts (ly:music-property m 'elements)) - (omit-root (and (pair? rest) (car rest))) - (pitches (map (lambda (x) (ly:music-property x 'pitch)) - (filter - (lambda (y) (memq 'note-event - (ly:music-property y 'types))) - elts))) - (sorted (sort pitches ly:pitch ..., - ;; but that is what we need because default octave for - ;; \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:music-property x 'text)) - (filter - (lambda (y) (memq 'text-script-event - (ly:music-property y 'types))) - elts))) - - (text (if (null? texts) #f (if omit-root (car texts) texts)))) + (omit-root (and (pair? rest) (car rest))) + (pitches (map (lambda (x) (ly:music-property x 'pitch)) + (filter + (lambda (y) (memq 'note-event + (ly:music-property y 'types))) + elts))) + (sorted (sort pitches ly:pitch ..., + ;; but that is what we need because default octave for + ;; \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:music-property x 'text)) + (filter + (lambda (y) (memq 'text-script-event + (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-event-chord? m) @@ -167,6 +168,5 @@ FOOBAR-MARKUP) if OMIT-ROOT is given and non-false. (not (equal? ZERO-MOMENT (ly:music-length m))))) (let* ((elts (filter is-event-chord? (ly:music-property seq 'elements))) - (alist (map chord-to-exception-entry elts))) - (filter (lambda (x) (cdr x)) alist))) - + (alist (map chord-to-exception-entry elts))) + (filter cdr alist)))