X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fcluster-engraver.cc;h=5ae931f3d98ce3b22dac6ea3e671c5d5d1b9c198;hb=04ae3a59a98ccdfa95db5664c88223a5805dc3db;hp=3f6f0cb5b9e3f6f6e0066638b0d9d1a2b5f8bffc;hpb=6ac8e1b2d7640826ae251e040de5efbc36da68ab;p=lilypond.git diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc index 3f6f0cb5b9..5ae931f3d9 100644 --- a/lily/cluster-engraver.cc +++ b/lily/cluster-engraver.cc @@ -1,7 +1,7 @@ /* cluster-engraver.cc -- implement Cluster_engraver - (c) 2002--2003 Juergen Reuter + (c) 2002--2004 Juergen Reuter Han-Wen Nienhuys */ @@ -17,7 +17,7 @@ class Cluster_spanner_engraver : public Engraver { protected: - TRANSLATOR_DECLARATIONS(Cluster_spanner_engraver); + TRANSLATOR_DECLARATIONS (Cluster_spanner_engraver); virtual bool try_music (Music *); virtual void process_music (); virtual void acknowledge_grob (Grob_info); @@ -78,9 +78,9 @@ Cluster_spanner_engraver::try_music (Music *m) void Cluster_spanner_engraver::process_music () { - if (cluster_notes_.size()) + if (cluster_notes_.size ()) { - SCM c0scm = get_property ("centralCPosition"); + SCM c0scm = get_property ("middleCPosition"); int c0 = gh_number_p (c0scm) ? gh_scm2int (c0scm) : 0; int pmax = INT_MIN; @@ -88,7 +88,7 @@ Cluster_spanner_engraver::process_music () for (int i = 0; i get_mus_property ("pitch")); + Pitch *pit =unsmob_pitch (cluster_notes_[i]->get_property ("pitch")); int p =( pit ? pit->steps () : 0) + c0; @@ -97,7 +97,7 @@ Cluster_spanner_engraver::process_music () } beacon_ = make_item ("ClusterSpannerBeacon"); - beacon_->set_grob_property ("positions", + beacon_->set_property ("positions", scm_cons (gh_int2scm (pmin), gh_int2scm (pmax))); announce_grob (beacon_, cluster_notes_[0]->self_scm ()); @@ -122,7 +122,7 @@ Cluster_spanner_engraver::stop_translation_timestep () { typeset_grobs (); - cluster_notes_.clear(); + cluster_notes_.clear (); } @@ -136,7 +136,7 @@ Cluster_spanner_engraver::acknowledge_grob (Grob_info info) } } -ENTER_DESCRIPTION(Cluster_spanner_engraver, +ENTER_DESCRIPTION (Cluster_spanner_engraver, /* descr */ "Engraves a cluster using Spanner notation ", /* creats*/ "ClusterSpanner ClusterSpannerBeacon", /* accepts */ "cluster-note-event",