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

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index e5bd41aea1..4f7483fc99 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,37 +1,65 @@
-\version "2.2.0"
+\version "2.16.0"
 
 chordmodifiers = #default-chord-modifier-list
 
-whiteTriangleMarkup = \markup { \override #'(font-encoding . TeX-math) "M" } 
 
-blackTriangleMarkup = \markup { \override #'(font-encoding . TeX-math) "N" }
+whiteTriangleMarkup = \markup {
+  \triangle ##f
+  %%  394 capital delta
+  %#(ly:wide-char->utf-8 #x0394)
 
-ignatzekExceptionMusic = \notes{
-	<c e gis>1-\markup { "+" }
-	<c es ges>-\markup { \super "o" } % should be $\circ$ ?
-	<c es ges bes>-\markup { \super \combine "o" "/" }
-	<c es ges beses>-\markup { \super  "o7" }
+  %% 2206 : delta from the symbol font.
+  %   #(ly:wide-char->utf-8 #x2206)
+
+  %% up pointing triangle
+  % #(ly:wide-char->utf-8 #x25B3)
+}
+
+blackTriangleMarkup = \markup {
+  \triangle ##t
+
+  %% black up pointing triangle
+%  #(ly:wide-char->utf-8 #x25B2)
 }
 
-ignatzekExceptions = #(sequential-music-to-chord-exceptions
-		       ignatzekExceptionMusic #t)
-
-partialJazzMusic = \notes{
-    <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" }
+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.
+    \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)
 }
 
+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" }
+}
+
+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)