* lily/kpath.cc:

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

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index a5c99754cc5910880389bf0bb2c140cfa14f4daf..fa98787cca6822d7f9446938ff1d163bf87747bc 100644 (file)
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,32 +1,53 @@
-\version "1.9.1"
+\version "2.4.0"
 
-\chordmodifiers #default-chord-modifier-list
+chordmodifiers = #default-chord-modifier-list
 
-whiteTriangleMarkup = #(make-override-markup
-                       '(font-family . math) (make-simple-markup "M"))
 
-blackTriangleMarkup = #(make-override-markup
-                       '(font-family . math) (make-simple-markup "N"))
+whiteTriangleMarkup = \markup {
+  %%  394 capital delta
+  %% #(ly:export (ly:wide-char->utf-8 #x0394))
 
-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" }
+
+  %% need to have symbol; can't deal with TTF yet.
+  \override #'(font-name . "Symbol")
+
+  %% 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))
+  
+  %% \override #'(font-encoding . TeX-math) \char #77
+} 
+
+blackTriangleMarkup = \markup {
+
+  %% 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" }
 }
 
 ignatzekExceptions = #(sequential-music-to-chord-exceptions
                       ignatzekExceptionMusic #t)
 
-partialJazzMusic = \notes{
-    <<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" }
+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" }
+    <c es f>-\markup { "m" }-\markup { \normal-size-super "sus4" }
+    <c d es>-\markup { "m" }-\markup { \normal-size-super "sus2" }
 }
 
 %% TODO: compatibility ignatzek code
@@ -36,4 +57,4 @@ fullJazzExceptions = #(sequential-music-to-chord-exceptions
 partialJazzExceptions = #(sequential-music-to-chord-exceptions
                           partialJazzMusic #f)
 
-                      
\ No newline at end of file
+