*** empty log message ***

diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly
index 3fa92bf71ea6a3ea0d659531e3fca5a1cd9b8fba..d6daa3d85ee4b606502b3388fa3821c8d5452b0d 100644 (file)
--- a/input/regression/chord-name-entry.ly
+++ b/input/regression/chord-name-entry.ly
@@ -17,6 +17,8 @@ c:dim_":dim"
 c:dim7_":dim7"
 c:sus4_":sus4"
 c:sus2_":sus2"
+c:6_":6"
+c:m6_":m6"
 c:3-_":3-"
 c:3+_":3+"
 c:5+.3-_":5+.3-"

diff --git a/scm/chord-entry.scm b/scm/chord-entry.scm
index e9f5f2bbae4560978ff4d0db75a7c6626985707d..c4ea088b483a1db4d27bc69af8c70feb6be917d7 100644 (file)
--- a/scm/chord-entry.scm
+++ b/scm/chord-entry.scm
@@ -169,11 +169,14 @@ Side effect: put original pitch in INVERSION.
     (set! complete-chord (map (lambda (x) (ly:pitch-transpose x root))
                              (sort complete-chord ly:pitch<?)))
 
-    ;; If natural 11 is present, but not given explicitly, we remove
-    ;; it.
+    ;; If natural 11 + natural 3 is present, but not given explicitly,
+    ;; we remove the 11.
     (if (and (not explicit-11)
             (get-step 11 complete-chord)
-            (= 0 (ly:pitch-alteration  (get-step 11 complete-chord))))
+            (get-step 3 complete-chord)
+            (= 0 (ly:pitch-alteration (get-step 11 complete-chord)))
+            (= 0 (ly:pitch-alteration (get-step 3 complete-chord)))
+            )
             
        (set! complete-chord (remove-step 11  complete-chord))
        )
@@ -282,7 +285,7 @@ UPPER-STEP separately."
     ((null? base) '())
     ((> (ly:pitch-steps upper-step) (ly:pitch-steps (car base)))
      (cons (car base) (stack-thirds upper-step  (cdr base))))
-    ((= (ly:pitch-steps upper-step) (ly:pitch-steps (car base)))
+    ((<= (ly:pitch-steps upper-step) (ly:pitch-steps (car base)))
      (list upper-step))
     (else '())
     ))