Reviewers: ,
Message:
please review
Description:
Make chord-naming robust against unsetting majorSevenSymbol
This will likely be changed anyway as soon as rewriting
chord-names is seriously tackled.
At least it might be a reminder to take care of the possibility
a user wants to unset majorSevenSymbol.
Please review this at https://codereview.appspot.com/288700043/
Affected files (+6, -4 lines):
M scm/chord-ignatzek-names.scm
Index: scm/chord-ignatzek-names.scm
diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm
index
f798c0fdf6aa7fc82aba8dceb62691cfeab4f9b5..483b8cac8f18fc6bb20598ae7ef7ccfb120c48ff
100644
--- a/scm/chord-ignatzek-names.scm
+++ b/scm/chord-ignatzek-names.scm
@@ -161,10 +161,12 @@ work than classifying the pitches."
(let* ((num-markup (make-simple-markup
(number->string (pitch-step pitch))))
(args (list num-markup))
- (total (if (= (ly:pitch-alteration pitch) 0)
- (if (= (pitch-step pitch) 7)
- (list (ly:context-property
context 'majorSevenSymbol))
- args)
+ (major-seven-symbol (ly:context-property
context 'majorSevenSymbol))
+ (total
+ (if (and (= (ly:pitch-alteration pitch) 0)
+ (= (pitch-step pitch) 7)
+ (markup? major-seven-symbol))
+ (list major-seven-symbol)
(cons (accidental->markup (step-alteration pitch))
args))))
(make-line-markup total)))
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
