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 b3a69abdb0fa16901e619007b9b63a8cb04d1024..98b11b675242bcbd459c720a8adaf2499f27c4af 100644 (file)
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,21 +1,37 @@
-\version "2.3.22"
+\version "2.12.0"
 
 chordmodifiers = #default-chord-modifier-list
 
-whiteTriangleMarkup = \markup { \override #'(font-encoding . TeX-math) \char #77 } 
 
-blackTriangleMarkup = \markup { \override #'(font-encoding . TeX-math) \char #78 }
+whiteTriangleMarkup = \markup {
+  \triangle ##f
+  %%  394 capital delta
+  %#(ly:export (ly:wide-char->utf-8 #x0394))
+
+  %% 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 = \markup {
+  \triangle ##t
+
+  %% 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 { \super \combine "o" "/" }
+       <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 = {
     <c d>1-\markup { \normal-size-super "2" }
     <c es>-\markup { "m" }
@@ -27,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)