*** empty log message ***

[lilypond.git] / scm / chord-name.scm

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index af8b06b6e63d57fb18ee57f8e72e944fae8a3772..186b035bf700a28677ed7cf830087fa91cf307ac 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 (define (natural-chord-alteration p)
@@ -21,7 +21,7 @@
        0.3
        0.6)
     (make-musicglyph-markup
-     (string-append "accidentals-" (number->string alteration))))))
+     (string-append "accidentals." (number->string alteration))))))
   
 (define (accidental->markup alteration)
   "Return accidental markup for ALTERATION."
@@ -56,7 +56,7 @@
       (make-normal-size-super-markup
        (accidental->markup (cdr n-a)))))))
 
-(define-public (note-name->german-markup  pitch)
+(define-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 . ,FLAT) (6 . ,DOUBLE-FLAT)))
@@ -65,13 +65,13 @@
     (make-line-markup
      (list
       (string-append
-       (list-ref '("c" "d" "e" "f" "g" "a" "h" "b")  (car n-a) )
+       (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) 2)))
+          (list-ref '("eses" "es" "" "is" "isis") (+ 2 (/ (cdr n-a) 2)))))))))
 
 ;; fixme we should standardize on omit-root (or the other one.)
-;; perhaps the  default should also be reversed --hwn
+;; 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 }
 to (cons CDE-PITCHES FOOBAR-MARKUP), or to (cons DE-PITCHES
@@ -105,12 +105,12 @@ FOOBAR-MARKUP) if OMIT-ROOT is given and non-false.
           (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:music-property m 'types))
      (not (equal? ZERO-MOMENT (ly:music-length m)))))
 
-  (let* ((elts (filter is-req-chord? (ly:music-property seq 'elements)))
+  (let* ((elts (filter is-event-chord? (ly:music-property seq 'elements)))
         (alist (map chord-to-exception-entry elts)))
     (filter (lambda (x) (cdr x)) alist)))