From: David Kastrup <dak@gnu.org>
Date: Thu, 23 Jul 2015 11:38:52 +0000 (+0200)
Subject: Issue 4433: chord step 14 should be flat by default
X-Git-Tag: release/2.19.25-1~32
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4fbbde84c11418ec6fc930ce632c1ba8dfd099d4;p=lilypond.git

Issue 4433: chord step 14 should be flat by default
---

diff --git a/lily/parser.yy b/lily/parser.yy
index 6fb3a8708b..3ed3216cd4 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -4087,14 +4087,12 @@ make_duration (SCM d, int dots)
 SCM
 make_chord_step (SCM step_scm, Rational alter)
 {
-        int step = scm_to_int (step_scm);
+	Pitch m (0, scm_to_int (step_scm) - 1, alter);
 
-	if (step == 7)
-		alter += FLAT_ALTERATION;
+	// Notename/octave are normalized
+	if (m.get_notename () == 6)
+		m = m.transposed (Pitch (0, 0, FLAT_ALTERATION));
 
-	while (step < 0)
-		step += 7;
-	Pitch m ((step -1) / 7, (step - 1) % 7, alter);
 	return m.smobbed_copy ();
 }