X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fchord-modifiers-init.ly;h=98b11b675242bcbd459c720a8adaf2499f27c4af;hb=4d040126cfd89587730265e549e3d28161642275;hp=36e7e03e1395d6baa6ec0c2a591b5df9059dc5cd;hpb=92b42d1e577d7c34248fe27534c3eefa1756233f;p=lilypond.git

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 36e7e03e13..98b11b6752 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,27 +1,55 @@
-\version "1.7.3"
-
-% urg!
-%
-\chordmodifiers #`(
-	(m . ,(ly:make-pitch 0 2 -1 ))
-	(min . ,(ly:make-pitch 0 2 -1 ))
-	(aug . ,(ly:make-pitch 0 4 1 ))
-	;; (dim . ,(ly:make-pitch -100 4 -1 ))	
-	(dim . ,(ly:make-pitch -100 2 -1 ))
-	;; urg, not actually a chord-modifier, but it works
-	;;  c7 -> <c bes>, c 7+ -> c b
-	(maj . ,(ly:make-pitch 0 6 1 ))
-	;; sus4 should delete 2 too...
-	(sus . ,(ly:make-pitch 0 3 0 ))
-)
-
-
-whiteTriangleMarkup =#(make-override-markup '(font-family . math) (make-simple-markup "M"))
-
-blackTriangleMarkup = #(make-override-markup '(font-family . math) (make-simple-markup "N"))
-
-ignatzekExceptionMusic =  \notes {
-	<<c e gis>>1-\markup { "+" }
-	<<c es ges>>-\markup { \super "o" } % should be $\circ$ ?
-	<<c es ges bes>>-\markup { \super \combine "o" "/" }
+\version "2.12.0"
+
+chordmodifiers = #default-chord-modifier-list
+
+
+whiteTriangleMarkup = \markup {
+  \triangle ##f
+  %%  394 capital delta
+  %#(ly:export (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))
+} 
+
+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 {
+	  %%  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" }
 }
+
+
+%% TODO: compatibility ignatzek code
+fullJazzExceptions=
+#(sequential-music-to-chord-exceptions ignatzekExceptionMusic #f)
+
+partialJazzExceptions=
+#(sequential-music-to-chord-exceptions partialJazzMusic #f)
+
+ignatzekExceptions  =
+#(sequential-music-to-chord-exceptions ignatzekExceptionMusic #t)