X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fchord-modifiers-init.ly;h=82d996d61b4cc6fc7f610bb8f7ab28c436e435b4;hb=c49d47e3859b857885408a9deda16a9973eb1e21;hp=590729b63cf40137ad3e22105c547c2c0a2e9fdd;hpb=129d7850e2f4c7ec781d6ec308e5ccb81d6a0424;p=lilypond.git

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 590729b63c..82d996d61b 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,24 +1,38 @@
-\version "2.1.30"
+\version "2.12.0"
 
 chordmodifiers = #default-chord-modifier-list
 
-whiteTriangleMarkup = #(make-override-markup
-			'(font-encoding . math) (make-simple-markup "M"))
 
-blackTriangleMarkup = #(make-override-markup
-			'(font-encoding . math) (make-simple-markup "N"))
+whiteTriangleMarkup = \markup {
+  \triangle ##f
+  %%  394 capital delta
+  %#(ly:export (ly:wide-char->utf-8 #x0394))
 
-ignatzekExceptionMusic = \notes{
+  %% 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 = \markup {
+  \triangle ##t
+
+  %% 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 { \super \combine "o" "/" }
+	<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" }
 }
 
-ignatzekExceptions = #(sequential-music-to-chord-exceptions
-		       ignatzekExceptionMusic #t)
-
-partialJazzMusic = \notes{
+partialJazzMusic = {
     <c d>1-\markup { \normal-size-super "2" }
     <c es>-\markup { "m" }
     <c f>-\markup { \normal-size-super "sus4" }
@@ -29,11 +43,21 @@ partialJazzMusic = \notes{
     <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)