* mf/feta-slag.mf (draw_trillelement): Fix shape to get clean

[lilypond.git] / ly / chord-modifiers-init.ly

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 8ca73942373a26fb602887293255f2c29ea870b6..863d4a996fc6094015eb352f60c1d5b8c97a1b70 100644 (file)
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,17 +1,37 @@
-\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 ))
-)
+\version "2.4.0"
 
+chordmodifiers = #default-chord-modifier-list
+
+whiteTriangleMarkup = \markup { \override #'(font-encoding . TeX-math) \char #77 } 
+
+blackTriangleMarkup = \markup { \override #'(font-encoding . TeX-math) \char #78 }
+
+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 beses>-\markup { \super  "o7" }
+}
+
+ignatzekExceptions = #(sequential-music-to-chord-exceptions
+                      ignatzekExceptionMusic #t)
+
+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)
+
+