-;;;; 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2000--2012 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;;
+;;;; 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 <http://www.gnu.org/licenses/>.
(define (natural-chord-alteration p)
"Return the natural alteration for step P."
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
- (format "accidentals.~a"
- (inexact->exact (* 4 alteration)))))))
-
+ (assoc-get alteration standard-alteration-glyph-name-alist "")))))
+
(define (accidental->markup alteration)
"Return accidental markup for ALTERATION."
(if (= alteration 0)
(make-hspace-markup (if (= alteration SHARP) 0.2 0.1))
))))
-(define-public (note-name->markup pitch)
- "Return pitch markup for PITCH."
+(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 (pitch-alteration-semitones pitch)
(inexact->exact (round (* (ly:pitch-alteration pitch) 2))))
-(define-safe-public ((chord-name->german-markup B-instead-of-Bb) pitch)
+(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)
(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) 2)))))))
-(define-safe-public (note-name->german-markup pitch)
+(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)))
(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'
-"
+(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
- (vector-ref
- (if re-with-eacute
- #("Do" "Ré" "Mi" "Fa" "Sol" "La" "Si")
- #("Do" "Re" "Mi" "Fa" "Sol" "La" "Si"))
- name))
+ (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)
))))
elts)))
(sorted (sort pitches ly:pitch<?))
(root (car sorted))
-
+
;; ugh?
;;(diff (ly:pitch-diff root (ly:make-pitch -1 0 0)))
;; FIXME. This results in #<Pitch c> ...,