Merge commit 'origin' into beamlets2

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

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 4054f532d3b4e1cd38812d24c8428c1b5a95408a..98b11b675242bcbd459c720a8adaf2499f27c4af 100644 (file)
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,43 +1,37 @@
-\version "2.4.0"
+\version "2.12.0"
 
 chordmodifiers = #default-chord-modifier-list
 
 
 whiteTriangleMarkup = \markup {
+  \triangle ##f
   %%  394 capital delta
-  %% #(ly:export (ly:wide-char->utf-8 #x0394))
+  %#(ly:export (ly:wide-char->utf-8 #x0394))
 
-  %% up pointing triangle
-  %% #(ly:export (ly:wide-char->utf-8 #x25B3))
+  %% 2206 : delta from the symbol font.
+  %   #(ly:export (ly:wide-char->utf-8 #x2206))
   
-  FIXME
-
-  %% \override #'(font-encoding . TeX-math) \char #77
-
+  %% 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))
-  FIXME
-  
-  %% \override #'(font-encoding . TeX-math) \char #78 }
+%  #(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 o with slash.
-         #(ly:export (ly:wide-char->utf-8 #x00f8))
+         %%  f8 is o with slash.
+         \super #(ly:export (ly:wide-char->utf-8 #x00f8))
        }
        <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" }
@@ -49,11 +43,13 @@ partialJazzMusic = {
     <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)
 
-                      
+ignatzekExceptions  =
+#(sequential-music-to-chord-exceptions ignatzekExceptionMusic #t)