X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fchord-modifiers-init.ly;h=4f7483fc99c42fff8c1d0bff872fd56cf8c6ea0a;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=ff0f2b0d0ef9d45b98cf17ee9cf9274dee552baf;hpb=4a417e8d8b243dc36d50cd344ac5a86465e2e637;p=lilypond.git

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index ff0f2b0d0e..4f7483fc99 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,64 +1,65 @@
-\version "2.4.0"
+\version "2.16.0"
 
 chordmodifiers = #default-chord-modifier-list
 
 
 whiteTriangleMarkup = \markup {
+  \triangle ##f
   %%  394 capital delta
-  %% #(ly:export (ly:wide-char->utf-8 #x0394))
-
-
-  %% need to have symbol; can't deal with TTF yet.
-  \override #'(font-name . "Symbol")
+  %#(ly:wide-char->utf-8 #x0394)
 
   %% 2206 : delta from the symbol font.
-     #(ly:export (ly:wide-char->utf-8 #x2206))
-  
-  %% up pointing triangle
-  %% #(ly:export (ly:wide-char->utf-8 #x25B3))
-  
-  %% \override #'(font-encoding . TeX-math) \char #77
+  %   #(ly:wide-char->utf-8 #x2206)
 
-} 
+  %% up pointing triangle
+  % #(ly:wide-char->utf-8 #x25B3)
+}
 
 blackTriangleMarkup = \markup {
+  \triangle ##t
 
   %% black up pointing triangle
-  %% #(ly:export (ly:wide-char->utf-8 #x25B2))
-  FIXME
-  
-  %% \override #'(font-encoding . TeX-math) \char #78 }
+%  #(ly:wide-char->utf-8 #x25B2)
 }
 
 ignatzekExceptionMusic = {
-	<c e gis>1-\markup { "+" }
-	<c es ges>-\markup { \super "o" } % should be $\circ$ ?
-	<c es ges bes>-\markup {
-	  %%  f8 is o with slash.
-	  \super #(ly:export (ly:wide-char->utf-8 #x00f8))
-	}
-	<c es ges beses>-\markup { \super  "o7" }
+  <c e gis>1-\markup { "+" }
+  <c es ges>-\markup { \super "o" } % should be $\circ$ ?
+  <c es ges bes>-\markup {
+    %%  f8 is o with slash.
+    \normal-size-super #(ly:wide-char->utf-8 #x00f8)
+  }
+  <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)
 }
 
-ignatzekExceptions = #(sequential-music-to-chord-exceptions
-		       ignatzekExceptionMusic #t)
-
 partialJazzMusic = {
-    <c d>1-\markup { \normal-size-super "2" }
-    <c es>-\markup { "m" }
-    <c f>-\markup { \normal-size-super "sus4" }
-    <c g>-\markup { \normal-size-super "5" }
-    
-    %% TODO, partial exceptions
-    <c es f>-\markup { "m" }-\markup { \normal-size-super "sus4" }
-    <c d es>-\markup { "m" }-\markup { \normal-size-super "sus2" }
+  <c d>1-\markup { \normal-size-super "2" }
+  <c es>-\markup { "m" }
+  <c f>-\markup { \normal-size-super "sus4" }
+  <c g>-\markup { \normal-size-super "5" }
+
+  %% TODO, partial exceptions
+  <c es f>-\markup { "m" }-\markup { \normal-size-super "sus4" }
+  <c d es>-\markup { "m" }-\markup { \normal-size-super "sus2" }
+}
+
+powerChordSymbol = {
+  <c g>-\markup { \normal-size-super "5" }
+  <c g c'>1-\markup { \normal-size-super "5" }
 }
 
+
 %% TODO: compatibility ignatzek code
-fullJazzExceptions = #(sequential-music-to-chord-exceptions
-                       ignatzekExceptionMusic #f)
+fullJazzExceptions=
+#(sequential-music-to-chord-exceptions ignatzekExceptionMusic #f)
+
+partialJazzExceptions=
+#(sequential-music-to-chord-exceptions partialJazzMusic #f)
 
-partialJazzExceptions = #(sequential-music-to-chord-exceptions
-                          partialJazzMusic #f)
+powerChordExceptions =
+#(sequential-music-to-chord-exceptions powerChordSymbol #t)
 
-		       
+ignatzekExceptions  =
+#(sequential-music-to-chord-exceptions ignatzekExceptionMusic #t)