From b4bbce14675ecd67b9c70a735c1940d63d22fbfe Mon Sep 17 00:00:00 2001 From: hanwen Date: Mon, 6 Mar 2006 17:58:32 +0000 Subject: [PATCH] * ly/music-functions-init.ly (Module): add shiftDurations * ly/drumpitch-init.ly (drumPitchNames): add tamtam. --- ChangeLog | 4 ++++ lily/side-position-interface.cc | 1 + lily/volta-bracket.cc | 2 ++ ly/drumpitch-init.ly | 1 + ly/music-functions-init.ly | 6 ++++++ scm/music-functions.scm | 4 ++-- 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9c7609bb0..b15e72a5f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-03-06 Han-Wen Nienhuys + * 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 3dfe6eb900..97c83b0f65 100644 --- 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 d601e476e6..ba33a4015d 100644 --- a/lily/volta-bracket.cc +++ b/lily/volta-bracket.cc @@ -74,6 +74,8 @@ Volta_bracket_interface::print (SCM smob) Drul_array 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 68ed30d565..074980ba21 100644 --- 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 8079d42e80..3255290a57 100644 --- 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 bf2063db95..2207e18601 100644 --- 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))) -- 2.39.2