X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fchord-modifiers-init.ly;h=4f7483fc99c42fff8c1d0bff872fd56cf8c6ea0a;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=2328779f4b0ae86c73c2a7ced0234f61302c3b7d;hpb=54685cedab8c7e6ce9cfc754dc6b6c646e8421ff;p=lilypond.git

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 2328779f4b..4f7483fc99 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,17 +1,65 @@
-\version "1.5.68"
-
-% urg!
-%
-\chordmodifiers #`(
-	(m . ,(make-pitch 0 2 -1 ))
-	(min . ,(make-pitch 0 2 -1 ))
-	(aug . ,(make-pitch 0 4 1 ))
-	;; (dim . ,(make-pitch -100 4 -1 ))	
-	(dim . ,(make-pitch -100 2 -1 ))
-	;; urg, not actually a chord-modifier, but it works
-	;;  c7 -> <c bes>, c 7+ -> c b
-	(maj . ,(make-pitch 0 6 1 ))
-	;; sus4 should delete 2 too...
-	(sus . ,(make-pitch 0 3 0 ))
-)
+\version "2.16.0"
 
+chordmodifiers = #default-chord-modifier-list
+
+
+whiteTriangleMarkup = \markup {
+  \triangle ##f
+  %%  394 capital delta
+  %#(ly:wide-char->utf-8 #x0394)
+
+  %% 2206 : delta from the symbol font.
+  %   #(ly:wide-char->utf-8 #x2206)
+
+  %% up pointing triangle
+  % #(ly:wide-char->utf-8 #x25B3)
+}
+
+blackTriangleMarkup = \markup {
+  \triangle ##t
+
+  %% black up pointing triangle
+%  #(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.
+    \normal-size-super #(ly:wide-char->utf-8 #x00f8)
+  }
+  <c es ges beses>-\markup { \super  "o7" }
+  <c e g b fis'>-\markup { \super "lyd" } % Lydian
+  <c e g bes des' ees' fis' aes'>-\markup { \super "alt" } % altered chord (super-Locrian)
+}
+
+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)