X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fchord-name.scm;h=0542893cc02726e42a400f494d861d8dec90ce66;hb=b92ea16ef75d8aaa7bdb9f492b58d7af906e7945;hp=6addeddc9325de5c1e80c5bb522c58ab29ab9a8c;hpb=e4dcfba304ce9c6c7d8b1696d5ff707dfde4a5b1;p=lilypond.git diff --git a/scm/chord-name.scm b/scm/chord-name.scm index 6addeddc93..0542893cc0 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -1,9 +1,20 @@ -;;;; chord-name.scm -- chord name utility functions +;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 2000--2004 Jan Nieuwenhuizen -;;;; Han-Wen Nienhuys +;;;; Copyright (C) 2000--2011 Jan Nieuwenhuizen +;;;; Han-Wen Nienhuys +;;;; +;;;; LilyPond is free software: you can redistribute it and/or modify +;;;; it under the terms of the GNU General Public License as published by +;;;; the Free Software Foundation, either version 3 of the License, or +;;;; (at your option) any later version. +;;;; +;;;; LilyPond is distributed in the hope that it will be useful, +;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;;; GNU General Public License for more details. +;;;; +;;;; You should have received a copy of the GNU General Public License +;;;; along with LilyPond. If not, see . (define (natural-chord-alteration p) "Return the natural alteration for step P." @@ -11,18 +22,24 @@ FLAT 0)) -;; +(define (conditional-string-downcase str condition) + (if condition + (string-downcase str) + str)) + +;; ;; TODO: make into markup. -;; +;; (define-public (alteration->text-accidental-markup alteration) + (make-smaller-markup (make-raise-markup (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." (if (= alteration 0) @@ -31,48 +48,87 @@ (alteration->text-accidental-markup alteration) (= alteration FLAT) 0.2))) -(define-public (note-name->markup pitch) - "Return pitch markup for PITCH." +(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 lowercase?) + "Return pitch markup for @var{pitch}." (make-line-markup (list (make-simple-markup - (vector-ref #("C" "D" "E" "F" "G" "A" "B") (ly:pitch-notename pitch))) - (accidental->markup (ly:pitch-alteration pitch))))) + (conditional-string-downcase + (vector-ref #("C" "D" "E" "F" "G" "A" "B") (ly:pitch-notename pitch)) + lowercase?)) + (accidental->markup (ly:pitch-alteration pitch))))) -(define-public ((chord-name->german-markup B-instead-of-Bb) pitch) +(define (pitch-alteration-semitones pitch) + (inexact->exact (round (* (ly:pitch-alteration pitch) 2)))) + +(define-safe-public ((chord-name->german-markup B-instead-of-Bb) + 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 (ly:pitch-alteration pitch)) - (n-a (if (member (cons name alt) `((6 . ,FLAT) (6 . ,DOUBLE-FLAT))) - (cons 7 (+ (if B-instead-of-Bb SEMI-TONE 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))) + (conditional-string-downcase + (vector-ref #("C" "D" "E" "F" "G" "A" "H" "B") (car n-a)) + lowercase?)) (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 lowercase?) (let* ((name (ly:pitch-notename pitch)) - (alt (ly:pitch-alteration pitch)) - (n-a (if (member (cons name alt) `((6 . ,FLAT) (6 . ,DOUBLE-FLAT))) - (cons 7 (+ SEMI-TONE 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) 2))) - (list-ref '("eses" "es" "" "is" "isis") (+ 2 (/ (cdr n-a) 2))))))))) + (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. +If @var{re-with-eacute} is set to @code{#t}, french `ré' is returned for +pitch@tie{}D instead of `re'." + + (let* ((name (ly:pitch-notename pitch)) + (alt (ly:pitch-alteration pitch))) + (make-line-markup + (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?)) + (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) +(define-safe-public (sequential-music-to-chord-exceptions seq . rest) "Transform sequential music SEQ of type <>-\\markup{ foobar } to (cons CDE-PITCHES FOOBAR-MARKUP), or to (cons DE-PITCHES FOOBAR-MARKUP) if OMIT-ROOT is given and non-false. @@ -88,7 +144,7 @@ FOOBAR-MARKUP) if OMIT-ROOT is given and non-false. elts))) (sorted (sort pitches ly:pitch ..., @@ -114,3 +170,31 @@ FOOBAR-MARKUP) if OMIT-ROOT is given and non-false. (alist (map chord-to-exception-entry elts))) (filter (lambda (x) (cdr x)) alist))) +(define-public (capo-handler pitches bass inversion context) + (let ((chord-function + (ly:context-property context 'chordNameFunction 'jazz-chord-names)) + (capo-pitch (ly:context-property context 'capoPitch #f))) + (if (not capo-pitch) + (chord-function pitches bass inversion context) ;; call the chordNameFunction as of old + (let* ((new-pitches ;; else transpose the pitches and do the chord twice + (map (lambda (p) + (ly:pitch-transpose p capo-pitch)) + pitches)) + (new-bass + (if (ly:pitch? bass) + (ly:pitch-transpose bass capo-pitch) + '())) + (new-inversion + (if (ly:pitch? inversion) + (ly:pitch-transpose inversion capo-pitch) + '())) + (capo-markup + (make-parenthesize-markup + (chord-function new-pitches new-bass new-inversion context))) + (name-markup (chord-function pitches bass inversion context)) + (capo-vertical (ly:context-property context 'capoVertical #f))) + (if capo-vertical + (make-column-markup (list name-markup capo-markup)) + (make-line-markup (list name-markup + (make-hspace-markup 1) + capo-markup)))))))