resolve merge

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

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 98b11b675242bcbd459c720a8adaf2499f27c4af..75b804bb051aeb455676df081c5960d03485997a 100644 (file)
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 
 chordmodifiers = #default-chord-modifier-list
 
@@ -43,6 +43,11 @@ partialJazzMusic = {
     <c d es>-\markup { "m" }-\markup { \normal-size-super "sus2" }
 }
 
+powerChordSymbol = {
+    <c g>-\markup { \normal-size-super "5" }
+    <c g c'>1-\markup { \normal-size-super "5" }
+}
+
 
 %% TODO: compatibility ignatzek code
 fullJazzExceptions=
@@ -51,5 +56,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)