X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fchord-modifiers-init.ly;h=e401937b023ad445670472df993d53d03c73ae78;hb=5aab972f13f92e7b3f0e2d5c22010422305ae5cb;hp=2f72eea81851ccf96d64556c889edb2d9f0cbf76;hpb=b584147c940e9456c2e0819e5af0afb765ade992;p=lilypond.git diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index 2f72eea818..e401937b02 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,24 +1,40 @@ -\version "2.1.30" +\version "2.10.0" 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 { + \triangle ##f + %% 394 capital delta + %#(ly:export (ly:wide-char->utf-8 #x0394)) -ignatzekExceptionMusic = \notes{ + %% 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 { + \triangle ##t + + %% black up pointing triangle +% #(ly:export (ly:wide-char->utf-8 #x25B2)) +} + +ignatzekExceptionMusic = { 1-\markup { "+" } -\markup { \super "o" } % should be $\circ$ ? - -\markup { \super \combine "o" "/" } + -\markup { + %% f8 is o with slash. + \super #(ly:export (ly:wide-char->utf-8 #x00f8)) + } -\markup { \super "o7" } } -ignatzekExceptions = #(sequential-music-to-chord-exceptions - ignatzekExceptionMusic #t) - -partialJazzMusic = \notes{ +partialJazzMusic = { 1-\markup { \normal-size-super "2" } -\markup { "m" } -\markup { \normal-size-super "sus4" } @@ -29,11 +45,13 @@ partialJazzMusic = \notes{ -\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)