replace tabs with spaces and fix indentation in ly/chord-modifiers-init.ly

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

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 294feac5e6a0803365ea3c6f1dc76768e710c8ec..dc5e58d02717639bf4773ed4fba7ba08a3be49ac 100644 (file)
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,19 +1,63 @@
-\version "1.7.18"
+\version "2.14.0"
 
+chordmodifiers = #default-chord-modifier-list
 
-\chordmodifiers #default-chord-modifier-list
 
+whiteTriangleMarkup = \markup {
+  \triangle ##f
+  %%  394 capital delta
+  %#(ly:export (ly:wide-char->utf-8 #x0394))
 
-whiteTriangleMarkup =#(make-override-markup '(font-family . math) (make-simple-markup "M"))
+  %% 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 = #(make-override-markup '(font-family . math) (make-simple-markup "N"))
+blackTriangleMarkup = \markup {
+  \triangle ##t
 
-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" }
+  %% black up pointing triangle
+%  #(ly:export (ly:wide-char->utf-8 #x25B2))
 }
 
-ignatzekExceptions = #(sequential-music-to-chord-exceptions ignatzekExceptionMusic)
+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" }
+}
+
+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)