Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

[lilypond.git] / ly / music-functions-init.ly

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index ea28ba4a58ccf86fd6995b5d03d6529a9852730b..129f6a3ade08d91a79ecfc446d1ffd13dee96e0c 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -144,7 +144,7 @@ breathe =
               'elements (list (make-music 'BreathingEvent))))
 
 bendAfter =
-#(define-music-function (parser location delta) (integer?)
+#(define-music-function (parser location delta) (real?)
              
   (make-music 'BendAfterEvent
    'delta-step delta))
@@ -157,7 +157,7 @@ clef =
    (make-clef-set type))
 
 
-compressMusic =
+scaleDurations =
 #(define-music-function
                  (parser location fraction music) (number-pair? ly:music?)
                  (ly:music-compress music (ly:make-moment (car fraction) (cdr fraction))))
@@ -304,9 +304,9 @@ label =
    (_i "Place a bookmarking label, either at top-level or inside music.")
    (make-music 'EventChord
               'page-marker #t
-              'label label
+              'page-label label
               'elements (list (make-music 'LabelEvent
-                                          'label label)))) 
+                                          'page-label label)))) 
 
 makeClusters =
 #(define-music-function
@@ -476,7 +476,16 @@ parenthesize =
 #(define-music-function (parser loc arg) (ly:music?)
    (_i "Tag @var{arg} to be parenthesized.")
 
-   (set! (ly:music-property arg 'parenthesize) #t)
+   (if (memq 'event-chord (ly:music-property arg 'types))
+     ; arg is an EventChord -> set the parenthesize property on all child notes and rests
+     (map
+       (lambda (ev)
+         (if (or (memq 'note-event (ly:music-property ev 'types))
+                 (memq 'rest-event (ly:music-property ev 'types)))
+           (set! (ly:music-property ev 'parenthesize) #t)))
+       (ly:music-property arg 'elements))
+     ; No chord, simply set property for this expression:
+     (set! (ly:music-property arg 'parenthesize) #t))
    arg)
 
 %% for lambda*