X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fchord-modifiers-init.ly;h=e401937b023ad445670472df993d53d03c73ae78;hb=5aab972f13f92e7b3f0e2d5c22010422305ae5cb;hp=e941550a5b9a86dd0f89f57b351fb6afa24e3a11;hpb=5a682bc69d9c7c70b161d002bc6e470303a3693f;p=lilypond.git

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index e941550a5b..e401937b02 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,39 +1,57 @@
-\version "1.7.18"
+\version "2.10.0"
 
-\chordmodifiers #default-chord-modifier-list
+chordmodifiers = #default-chord-modifier-list
 
-whiteTriangleMarkup = #(make-override-markup
-			'(font-family . math) (make-simple-markup "M"))
 
-blackTriangleMarkup = #(make-override-markup
-			'(font-family . math) (make-simple-markup "N"))
+whiteTriangleMarkup = \markup {
+  \triangle ##f
+  %%  394 capital delta
+  %#(ly:export (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: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
+} 
+
+blackTriangleMarkup = \markup {
+  \triangle ##t
+
+  %% black up pointing triangle
+%  #(ly:export (ly:wide-char->utf-8 #x25B2))
 }
 
-ignatzekExceptions = #(sequential-music-to-chord-exceptions
-		       ignatzekExceptionMusic #t)
+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 = \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" }
+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 es f>-\markup { "m" }-\markup { \normal-size-super "sus4" }
+    <c d es>-\markup { "m" }-\markup { \normal-size-super "sus2" }
 }
 
+
 %% 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)
 
-		       
\ No newline at end of file
+ignatzekExceptions  =
+#(sequential-music-to-chord-exceptions ignatzekExceptionMusic #t)