diff options
| author | Thomas Morley <thomasmorley65@gmail.com> | 2016-03-22 11:32:53 +0100 |
|---|---|---|
| committer | Thomas Morley <thomasmorley65@gmail.com> | 2016-03-28 15:00:02 +0200 |
| commit | 82e8427010b8e1a932e0642f03b0c94a8494f03a (patch) | |
| tree | 05b7c17a73d20f332a9001711fea95c37d9d3bc4 /scm | |
| parent | c9497808c2ab14a1dee3bce8e9ab29debb09553f (diff) | |
Issue 4808 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.
Regtest amended.
Diffstat (limited to 'scm')
| -rw-r--r-- | scm/chord-ignatzek-names.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm index f798c0fdf6..483b8cac8f 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))) |