resolve merge

[lilypond.git] / ly / dynamic-scripts-init.ly

diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly
index a29430f15898a003428b01f5367005d5836343dc..33755fdd8535b4b02b11a2d4c40a79d0b71a64f8 100644 (file)
--- a/ly/dynamic-scripts-init.ly
+++ b/ly/dynamic-scripts-init.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 
 %
 % declare the standard dynamic identifiers.
@@ -7,6 +7,8 @@
 #(define (make-dynamic-script str)
    (make-music 'AbsoluteDynamicEvent
               'text str))
+
+%% don't exceed ppppp or fffff; see midi.scm.
 ppppp = #(make-dynamic-script "ppppp")
 pppp = #(make-dynamic-script "pppp")
 ppp = #(make-dynamic-script "ppp")
@@ -20,6 +22,7 @@ mf = #(make-dynamic-script "mf")
 ff = #(make-dynamic-script "ff")
 fff = #(make-dynamic-script "fff")
 ffff = #(make-dynamic-script "ffff")
+fffff = #(make-dynamic-script "fffff")
 fp = #(make-dynamic-script "fp")
 sf = #(make-dynamic-script "sf")
 sfp = #(make-dynamic-script "sfp")