From 06a7631ec6e29338a5a7cddbbc6482a2896607bf Mon Sep 17 00:00:00 2001
From: Adam Spiers <lilypond@adamspiers.org>
Date: Tue, 1 Nov 2011 18:29:31 +0000
Subject: [PATCH] Issue 1503 - add support for "altered" jazz chord
 (super-Locrian)

---
 Documentation/included/chord-names-jazz.ly | 161 +++++++++++----------
 input/regression/chords-funky-ignatzek.ly  |   1 +
 ly/chord-modifiers-init.ly                 |   1 +
 3 files changed, 84 insertions(+), 79 deletions(-)

diff --git a/Documentation/included/chord-names-jazz.ly b/Documentation/included/chord-names-jazz.ly
index fdf49e9afa..5ef6039053 100644
--- a/Documentation/included/chord-names-jazz.ly
+++ b/Documentation/included/chord-names-jazz.ly
@@ -15,51 +15,52 @@ are turned off for brevity.
 
 chs =  \transpose c' c'
 {
-	<c e g>1
-	<c es g>% m = minor triad
-	<c e gis>
-	<c es ges> \break
-	<c e g bes>
-	<c es g bes>
-	<c e g b> 		% triangle = maj
-	<c es ges beses>
-	<c es ges b> \break
-	<c e gis bes>
-	<c es g b>
-	<c e gis b>
-	<c es ges bes>\break
-	<c e g a>   % 6 = major triad with added sixth
-	<c es g a>  % m6 = minor triad with added sixth
-	<c e g bes d'>
-	<c es g bes d'> \break
-	<c es g bes d' f' a' >
-	<c es g bes d' f' >
-	<c es ges bes d' >
-	<c e g bes des' > \break
-	<c e g bes dis'>
-	<c e g bes d' f'>
-	<c e g bes d' fis'>
-	<c e g bes d' f' a'>\break
-	<c e g bes d' fis' as'>
-	<c e gis bes dis'>
-	<c e g bes dis' fis'>
-	<c e g bes d' f' as'>\break
-	<c e g bes des' f' as'>
-	<c e g bes d' fis'>
-	<c e g b d'>
-	<c e g bes d' f' as'>\break
-	<c e g bes des' f' as'>
-	<c e g bes des' f' a'>
-	<c e g b d'>
-	<c e g b d' f' a'>\break
-	<c e g b d' fis'>
-	<c e g bes des' f ' a'>
-	<c f g>
-	<c f g bes>\break
-	<c f g bes d'>
-	<c e g d'>	% add9
-	<c es g f'>
-	<c e g b fis'>	% Lydian
+    <c e g>1
+    <c es g>% m = minor triad
+    <c e gis>
+    <c es ges> \break
+    <c e g bes>
+    <c es g bes>
+    <c e g b>           % triangle = maj
+    <c es ges beses>
+    <c es ges b> \break
+    <c e gis bes>
+    <c es g b>
+    <c e gis b>
+    <c es ges bes>\break
+    <c e g a>   % 6 = major triad with added sixth
+    <c es g a>  % m6 = minor triad with added sixth
+    <c e g bes d'>
+    <c es g bes d'> \break
+    <c es g bes d' f' a' >
+    <c es g bes d' f' >
+    <c es ges bes d' >
+    <c e g bes des' > \break
+    <c e g bes dis'>
+    <c e g bes d' f'>
+    <c e g bes d' fis'>
+    <c e g bes d' f' a'>\break
+    <c e g bes d' fis' as'>
+    <c e gis bes dis'>
+    <c e g bes dis' fis'>
+    <c e g bes d' f' as'>\break
+    <c e g bes des' f' as'>
+    <c e g bes d' fis'>
+    <c e g b d'>
+    <c e g bes d' f' as'>\break
+    <c e g bes des' f' as'>
+    <c e g bes des' f' a'>
+    <c e g b d'>
+    <c e g b d' f' a'>\break
+    <c e g b d' fis'>
+    <c e g bes des' f ' a'>
+    <c f g>
+    <c f g bes>\break
+    <c f g bes d'>
+    <c e g d'>  % add9
+    <c es g f'>
+    <c e g b fis'>  % Lydian
+    <c e g bes des' ees' fis' aes'>  % altered chord
 }
 
 
@@ -69,9 +70,11 @@ chs =  \transpose c' c'
 efullmusicJazzAlt =
 {
     <c e gis>1-\markup { "+" }
-    <c e g b>-\markup { \normal-size-super
-    %			  \override #'(font-family . math) "N" }
-			  \override #'(font-family . math) "M" }
+    <c e g b>-\markup {
+      \normal-size-super
+    % \override #'(font-family . math) "N"
+      \override #'(font-family . math) "M"
+    }
     %%c:3.5.7 = \markup { \override #'(font-family . math) "M" }
     %%c:3.5.7 = \markup { \normal-size-super "maj7" }
 
@@ -104,50 +107,50 @@ jazzAltProperties = \sequential {
 }
 
 banterProperties = \sequential {
-	    \set chordNameFunction = #banter-chord-names
+    \set chordNameFunction = #banter-chord-names
 }
 
 \score{
     <<
-	\new ChordNames {
-	    \set instrumentName = #"Ignatzek (default)"
-	    \set shortInstrumentName = #"Def"
-	    \chs
-	}
-
-	\new ChordNames {
-	    \jazzAltProperties
-	    \set instrumentName = #"Alternative"
-	    \set shortInstrumentName = #"Alt"
-	    \chs
-	}
+        \new ChordNames {
+            \set instrumentName = #"Ignatzek (default)"
+            \set shortInstrumentName = #"Def"
+            \chs
+        }
+
+        \new ChordNames {
+            \jazzAltProperties
+            \set instrumentName = #"Alternative"
+            \set shortInstrumentName = #"Alt"
+            \chs
+        }
 
 %{
 
-	%% This is the Banter (1987) style.  It gives exceedingly
-	%% verbose (wide) names, making the output file take up to 4 pages.
-	%% (TODO: how big is is now?)
-	%% Turned off by default.
+        %% This is the Banter (1987) style.  It gives exceedingly
+        %% verbose (wide) names, making the output file take up to 4 pages.
+        %% (TODO: how big is is now?)
+        %% Turned off by default.
 
-	%% TODO: use smaller font for Banter (or remove some esoteric
-	%% chords).
+        %% TODO: use smaller font for Banter (or remove some esoteric
+        %% chords).
 
-	\new ChordNames {
-	    \banterProperties
-	    \set instrumentName = #"Banter"
-	    \set shortInstrumentName = #"Ban"
-	    \chs
-	}
+        \new ChordNames {
+            \banterProperties
+            \set instrumentName = #"Banter"
+            \set shortInstrumentName = #"Ban"
+            \chs
+        }
 %}
 
-	\new Staff  \transpose c c' { \chs }
+        \new Staff  \transpose c c' { \chs }
     >>
     \layout {
-	indent = 3.\cm
-	\context {
-	    \ChordNames
-	    \consists Instrument_name_engraver
-	}
+        indent = 3.\cm
+        \context {
+            \ChordNames
+            \consists Instrument_name_engraver
+        }
     }
 }
 
diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly
index c1545c03de..7cda44e612 100644
--- a/input/regression/chords-funky-ignatzek.ly
+++ b/input/regression/chords-funky-ignatzek.ly
@@ -21,6 +21,7 @@ chs =
 <c e g a bes>1
 <c e g a d'>1
 <c e g b fis'>1
+<c e g bes des' ees' fis' aes'>1
 }
 
 
diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 15b54b559c..1041e88c72 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -31,6 +31,7 @@ ignatzekExceptionMusic = {
   }
   <c es ges beses>-\markup { \super  "o7" }
   <c e g b fis'>-\markup { \super "lyd" } % Lydian
+  <c e g bes des' ees' fis' aes'>-\markup { \super "alt" } % altered chord (super-Locrian)
 }
 
 partialJazzMusic = {
-- 
2.39.2