X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fchord-modifiers-init.ly;h=4f7483fc99c42fff8c1d0bff872fd56cf8c6ea0a;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=9eb3d8cb8f1173e06d3aadc785d0d32c6582f0a3;hpb=82133f77b5708a4f58b1dfc5c61e54a2d9e4bb9d;p=lilypond.git diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index 9eb3d8cb8f..4f7483fc99 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.16.0" chordmodifiers = #default-chord-modifier-list @@ -6,41 +6,48 @@ chordmodifiers = #default-chord-modifier-list whiteTriangleMarkup = \markup { \triangle ##f %% 394 capital delta - %#(ly:export (ly:wide-char->utf-8 #x0394)) + %#(ly:wide-char->utf-8 #x0394) %% 2206 : delta from the symbol font. - % #(ly:export (ly:wide-char->utf-8 #x2206)) - + % #(ly:wide-char->utf-8 #x2206) + %% up pointing triangle - % #(ly:export (ly:wide-char->utf-8 #x25B3)) -} + % #(ly:wide-char->utf-8 #x25B3) +} blackTriangleMarkup = \markup { \triangle ##t %% black up pointing triangle -% #(ly:export (ly:wide-char->utf-8 #x25B2)) +% #(ly:wide-char->utf-8 #x25B2) } ignatzekExceptionMusic = { - 1-\markup { "+" } - -\markup { \super "o" } % should be $\circ$ ? - -\markup { - %% f8 is o with slash. - \super #(ly:export (ly:wide-char->utf-8 #x00f8)) - } - -\markup { \super "o7" } + 1-\markup { "+" } + -\markup { \super "o" } % should be $\circ$ ? + -\markup { + %% f8 is o with slash. + \normal-size-super #(ly:wide-char->utf-8 #x00f8) + } + -\markup { \super "o7" } + -\markup { \super "lyd" } % Lydian + -\markup { \super "alt" } % altered chord (super-Locrian) } partialJazzMusic = { - 1-\markup { \normal-size-super "2" } - -\markup { "m" } - -\markup { \normal-size-super "sus4" } - -\markup { \normal-size-super "5" } - - %% TODO, partial exceptions - -\markup { "m" }-\markup { \normal-size-super "sus4" } - -\markup { "m" }-\markup { \normal-size-super "sus2" } + 1-\markup { \normal-size-super "2" } + -\markup { "m" } + -\markup { \normal-size-super "sus4" } + -\markup { \normal-size-super "5" } + + %% TODO, partial exceptions + -\markup { "m" }-\markup { \normal-size-super "sus4" } + -\markup { "m" }-\markup { \normal-size-super "sus2" } +} + +powerChordSymbol = { + -\markup { \normal-size-super "5" } + 1-\markup { \normal-size-super "5" } } @@ -51,5 +58,8 @@ fullJazzExceptions= partialJazzExceptions= #(sequential-music-to-chord-exceptions partialJazzMusic #f) +powerChordExceptions = +#(sequential-music-to-chord-exceptions powerChordSymbol #t) + ignatzekExceptions = #(sequential-music-to-chord-exceptions ignatzekExceptionMusic #t)