* ly/music-functions-init.ly (Module): add shiftDurations

* ly/drumpitch-init.ly (drumPitchNames): add tamtam.

diff --git a/ChangeLog b/ChangeLog
index b9c7609bb0df1c8d852a947fc8b9b31f9a775e12..b15e72a5f817b2dbb4ce80f929c9594d82786940 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-03-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * ly/music-functions-init.ly (Module): add shiftDurations
+
+       * ly/drumpitch-init.ly (drumPitchNames): add tamtam.
+
        * scm/paper.scm (paper-alist): no decimals for Ax paper sizes. 
 
        * ly/engraver-init.ly: init vocalName to nil.

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 3dfe6eb900d9026a13c3b250600bc752c74ee6a7..97c83b0f6554faa79efa153305f11c2d94c9fbe1 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -118,6 +118,7 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten
 
 
 MAKE_SCHEME_CALLBACK (Side_position_interface, y_aligned_on_support_refpoints, 1);
+
 SCM
 Side_position_interface::y_aligned_on_support_refpoints (SCM smob)
 {

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index d601e476e6b711286a536795c09f631afcfc2d11..ba33a4015dd2cab815848529def4e998526fac94 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -74,6 +74,8 @@ Volta_bracket_interface::print (SCM smob)
   Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
                                                  Interval (0, 0));
 
+
+  
   scale_drul (&edge_height, - Real (get_grob_direction (me)));
 
   Interval empty;

diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly
index 68ed30d565ecf52be6955db0a6e18fdfc4ea075c..074980ba21a19e4b74cde6b97e8b95696650ccdc 100644 (file)
--- a/ly/drumpitch-init.ly
+++ b/ly/drumpitch-init.ly
@@ -138,6 +138,7 @@ drumPitchNames =
    (trim . mutetriangle)
    (tri . triangle)
    (trio . opentriangle)
+   (tt . tamtam)
    (ua . oneup)
    (ub . twoup)
    (uc . threeup)

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 8079d42e80e805013543da0037d390b724800494..3255290a5748bc5284e05a50a117ed2e2dcba945 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -78,6 +78,12 @@ applyContext =
                    'origin location
                    'procedure proc))
 
+shiftDurations =
+#(define-music-function (parser location dur dots arg) (integer? integer? ly:music?)
+   (music-map
+    (lambda (x)
+      (shift-one-duration-log x dur dots)) arg))
+
 musicMap =
 #(define-music-function (parser location proc mus) (procedure? ly:music?)
             (music-map proc mus))

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index bf2063db9545911029605422a285bbfb6cb06694..2207e18601f6812641f0dad2c7aaa45317e0838a 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -182,8 +182,8 @@ Returns `obj'.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define (shift-one-duration-log music shift dot)
-  "  add SHIFT to ly:duration-log and optionally 
+(define-public (shift-one-duration-log music shift dot)
+  "  add SHIFT to duration-log of 'duration in music and optionally 
   a dot to any note encountered. This scales the music up by a factor 
   2^shift * (2 - (1/2)^dot)"
   (let ((d (ly:music-property music 'duration)))