release: 1.3.74

[lilypond.git] / lily / bar-number-engraver.cc

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 3aa50afbf22914da8eea7a5a42536f7d174f2eb6..34a0cb2eae3228113aa22b72c3212cd03c693f43 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -12,7 +12,7 @@
 #include "paper-def.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol.hh"
-#include "text-item.hh"
+#include "item.hh"
 #include "moment.hh"
 #include "engraver.hh"
 #include "protected-scm.hh"
@@ -20,12 +20,11 @@
 class Bar_number_engraver : public Engraver
 {
 protected:
-  Text_item* text_p_;
-  Protected_scm visibility_lambda_;
+  Item* text_p_;
+
   Protected_scm staffs_;
 
 protected:
-  virtual void do_creation_processing ();
   virtual void do_pre_move_processing ();
   virtual void acknowledge_element (Score_element_info);
   void create_items();
@@ -62,15 +61,6 @@ Bar_number_engraver::Bar_number_engraver ()
   staffs_ = SCM_EOL;
 }
 
-void
-Bar_number_engraver::do_creation_processing ()
-{
-  String t = "barNumberVisibilityFunction";
-  SCM proc = get_property (t);
-
-  if (gh_procedure_p (proc))
-    visibility_lambda_ = proc;
-}
 
 
                                               
@@ -78,9 +68,9 @@ void
 Bar_number_engraver::acknowledge_element (Score_element_info inf)
 {
   Score_element * s = inf.elem_l_;
-  if (dynamic_cast<Staff_symbol*> (s))
+  if (Staff_symbol::has_interface (s))
     {
-      staffs_ = gh_cons (inf.elem_l_->self_scm_, staffs_);
+      staffs_ = gh_cons (inf.elem_l_->self_scm (), staffs_);
     }
   else if (text_p_
           && dynamic_cast<Item*> (s)
@@ -98,7 +88,7 @@ Bar_number_engraver::do_pre_move_processing ()
 {
   if (text_p_)
     {
-      text_p_->set_elt_property ("side-support", staffs_);
+      text_p_->set_elt_property ("side-support-elements", staffs_);
       typeset_element (text_p_);
       text_p_ =0;
     }
@@ -110,11 +100,10 @@ Bar_number_engraver::create_items ()
 {
   if (text_p_)
     return;
-  
-  text_p_ = new Text_item;
-  text_p_->set_elt_property ("breakable", SCM_BOOL_T); // ugh
-  Side_position_interface staffside(text_p_);
-  staffside.set_axis (Y_AXIS);
+
+  SCM b = get_property ("basicBarNumberProperties");
+  text_p_ = new Item (b);
+  Side_position::set_axis(text_p_,Y_AXIS);
 
   SCM prop = get_property ("barNumberDirection");
   if (!isdir_b (prop))
@@ -135,10 +124,7 @@ Bar_number_engraver::create_items ()
                            gh_double2scm(paper_l ()->get_var ("interline")));
     }
 
-  if (gh_procedure_p (visibility_lambda_))
-      text_p_->set_elt_property ("visibility-lambda",
-                                visibility_lambda_);
 
-  announce_element (Score_element_info (text_p_, 0));
+  announce_element (text_p_, 0);
 }