*** empty log message ***

[lilypond.git] / scm / chord-ignatzek-names.scm

diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm
index 3a23a4a05f5cb9ade3b3d19437b73432cc07417c..26fa220e8f78068ecc6ccd73b0ebaba9692562bd 100644 (file)
--- a/scm/chord-ignatzek-names.scm
+++ b/scm/chord-ignatzek-names.scm
@@ -3,7 +3,7 @@
 ;;;
 ;;; source file of the GNU LilyPond music typesetter
 ;;; 
-;;; (c)  2000--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;; (c)  2000--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
 
@@ -82,14 +82,14 @@
            ps)
        ))
   
-  (define name-root (ly:get-context-property context 'chordRootNamer))
+  (define name-root (ly:context-property context 'chordRootNamer))
   (define name-note 
-    (let ((nn (ly:get-context-property context 'chordNoteNamer)))
+    (let ((nn (ly:context-property context 'chordNoteNamer)))
       (if (eq? nn '())
          ; replacing the next line with name-root gives guile-error...? -rz
 
          ;; apparently sequence of defines is equivalent to let, not let* ? -hwn
-         (ly:get-context-property context 'chordRootNamer)       
+         (ly:context-property context 'chordRootNamer)   
          ;; name-root
          nn)))
 
@@ -137,7 +137,7 @@ work than classifying the pitches."
     
     (define (prefix-modifier->markup mod)
       (if (and (= 3 (pitch-step mod))
-              (= -1 (ly:pitch-alteration mod)))
+              (= FLAT (ly:pitch-alteration mod)))
          (make-simple-markup "m")
          (make-simple-markup "huh")
          ))
@@ -177,7 +177,7 @@ work than classifying the pitches."
           (args (list num-markup))
           (total (if (= (ly:pitch-alteration pitch) 0)
                      (if (= (pitch-step pitch) 7)
-                         (list (ly:get-context-property context 'majorSevenSymbol))
+                         (list (ly:context-property context 'majorSevenSymbol))
                          args)
                      (cons (accidental->markup (step-alteration pitch)) args)
                      ))
@@ -187,7 +187,7 @@ work than classifying the pitches."
 
     (let*
        (
-        (sep (ly:get-context-property context 'chordNameSeparator))
+        (sep (ly:context-property context 'chordNameSeparator))
         (root-markup (name-root root))
         (add-markups (map (lambda (x)
                             (glue-word-to-step "add" x))
@@ -229,7 +229,7 @@ work than classifying the pitches."
        ,exception-markup
        . 
        ,(if (ly:pitch? bass-pitch)
-           (list (ly:get-context-property context 'chordNameSeparator)
+           (list (ly:context-property context 'chordNameSeparator)
                  (name-note bass-pitch))
           '()))))
 
@@ -237,7 +237,7 @@ work than classifying the pitches."
       (
        (root (car in-pitches))
        (pitches (map (lambda (x) (ly:pitch-diff x root)) (cdr in-pitches)))
-       (exceptions (ly:get-context-property context 'chordNameExceptions))
+       (exceptions (ly:context-property context 'chordNameExceptions))
        (exception (assoc-get-default pitches exceptions #f))
        (prefixes '())
        (suffixes '())
@@ -273,9 +273,8 @@ work than classifying the pitches."
 
        ;; do minor-3rd modifier.
        (if (and (get-step 3 pitches)
-               (= (ly:pitch-alteration (get-step 3 pitches)) -1))
-          (set! prefixes (cons (get-step 3 pitches) prefixes))
-          )
+               (= (ly:pitch-alteration (get-step 3 pitches)) FLAT))
+          (set! prefixes (cons (get-step 3 pitches) prefixes)))
        
        ;; lazy bum. Should write loop.
        (cond