* configure.in: Test for and accept lmodern if EC fonts not found.

[lilypond.git] / lily / cluster-engraver.cc

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index 5ae931f3d98ce3b22dac6ea3e671c5d5d1b9c198..0730c28b2840b860ae31ed37d9b2da641ad28984 100644 (file)
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -7,7 +7,6 @@
 */
 
 #include "engraver.hh"
-#include "item.hh"
 #include "spanner.hh"
 #include "note-head.hh"
 #include "note-column.hh"
@@ -51,17 +50,8 @@ Cluster_spanner_engraver::finalize ()
 void
 Cluster_spanner_engraver::typeset_grobs ()
 {
-  if (finished_spanner_ )
-    {
-      typeset_grob (finished_spanner_);
-      finished_spanner_ = 0;
-    }
-
-  if (beacon_)
-    {
-      typeset_grob (beacon_);
-      beacon_ = 0;
-    }
+  finished_spanner_ = 0;
+  beacon_ = 0;
 }
 
 bool
@@ -82,7 +72,7 @@ Cluster_spanner_engraver::process_music ()
     {
       SCM c0scm = get_property ("middleCPosition");
 
-      int c0 =  gh_number_p (c0scm) ? gh_scm2int (c0scm) : 0;
+      int c0 =  scm_is_number (c0scm) ? scm_to_int (c0scm) : 0;
       int pmax = INT_MIN;
       int pmin = INT_MAX;
       
@@ -96,17 +86,15 @@ Cluster_spanner_engraver::process_music ()
          pmin = pmin <? p;
        }
       
-      beacon_ = make_item ("ClusterSpannerBeacon");
+      beacon_ = make_item ("ClusterSpannerBeacon", cluster_notes_[0]->self_scm ());
       beacon_->set_property ("positions",
-                                 scm_cons (gh_int2scm (pmin),
-                                           gh_int2scm (pmax)));
-      announce_grob (beacon_, cluster_notes_[0]->self_scm ());
+                                 scm_cons (scm_int2num (pmin),
+                                           scm_int2num (pmax)));
     }
 
   if (beacon_ && !spanner_)
     {    
-      spanner_ = make_spanner ("ClusterSpanner");
-      announce_grob (spanner_, cluster_notes_[0]->self_scm ());
+      spanner_ = make_spanner ("ClusterSpanner", cluster_notes_[0]->self_scm () );
     }
   
   if (beacon_ && spanner_)