X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fchord-modifiers-init.ly;h=75b804bb051aeb455676df081c5960d03485997a;hb=f788af8600d4526dbe91bac59b275bfc41cd278b;hp=f8266423c102374273478210353cb6d25edcf4fc;hpb=23f2fd28f3ddbe88bbb16a27b068db2e9e31139b;p=lilypond.git

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index f8266423c1..75b804bb05 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,16 +1,63 @@
-\version "1.7.3"
+\version "2.14.0"
 
+chordmodifiers = #default-chord-modifier-list
 
-\chordmodifiers #default-chord-modifier-list
 
+whiteTriangleMarkup = \markup {
+  \triangle ##f
+  %%  394 capital delta
+  %#(ly:export (ly:wide-char->utf-8 #x0394))
 
-whiteTriangleMarkup =#(make-override-markup '(font-family . math) (make-simple-markup "M"))
+  %% 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))
+} 
 
-blackTriangleMarkup = #(make-override-markup '(font-family . math) (make-simple-markup "N"))
+blackTriangleMarkup = \markup {
+  \triangle ##t
 
-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" }
+  %% black up pointing triangle
+%  #(ly:export (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" }
+}
+
+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)
+
+partialJazzExceptions=
+#(sequential-music-to-chord-exceptions partialJazzMusic #f)
+
+powerChordExceptions =
+  #(sequential-music-to-chord-exceptions powerChordSymbol #t)
+
+ignatzekExceptions  =
+#(sequential-music-to-chord-exceptions ignatzekExceptionMusic #t)