X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbar-number-engraver.cc;h=3ab788c9284b9ae22dded822b4f42730fc171472;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=34a0cb2eae3228113aa22b72c3212cd03c693f43;hpb=9c8bcb9a2a1fedb5459e593b18a8c550318e6800;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 34a0cb2eae..3ab788c928 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,70 +11,64 @@
 #include "paper-column.hh"
 #include "paper-def.hh"
 #include "side-position-interface.hh"
-#include "staff-symbol.hh"
 #include "item.hh"
 #include "moment.hh"
 #include "engraver.hh"
-#include "protected-scm.hh"
+#include "translator-group.hh"
+
 
 class Bar_number_engraver : public Engraver
 {
 protected:
   Item* text_p_;
 
-  Protected_scm staffs_;
-
 protected:
-  virtual void do_pre_move_processing ();
-  virtual void acknowledge_element (Score_element_info);
-  void create_items();
-  void do_process_music ();
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  Bar_number_engraver();
+  virtual void stop_translation_timestep ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void create_grobs ();
+  void create_items ();
+  TRANSLATOR_DECLARATIONS(  Bar_number_engraver );
 };
 
+
+/*
+  TODO: more advanced formatting via SCM function, perhaps barnumbers
+  every 5 measures?  */
+
 void
-Bar_number_engraver::do_process_music ()
+Bar_number_engraver::create_grobs ()
 {
-  // todo include (&&!time->cadenza_b_ )
-  SCM bn = get_property("currentBarNumber");
+  // todo include (&&!time->cadenza_b_)
+  SCM bn = get_property ("currentBarNumber");
   SCM smp = get_property ("measurePosition");
-  Moment mp =  (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+  Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
   
   if (gh_number_p (bn) &&
-      !mp && now_mom () > Moment (0))
+      !mp.to_bool () && now_mom () > Moment (0))
     {
       create_items ();
 
       // guh.
-      text_p_->set_elt_property ("text",
-				 ly_str02scm (to_str (gh_scm2int (bn)).ch_C()));
+      text_p_->set_grob_property ("text",
+				 ly_str02scm (to_str (gh_scm2int (bn)).ch_C ()));
     }
 }
 
-ADD_THIS_TRANSLATOR(Bar_number_engraver);
+
 
 Bar_number_engraver::Bar_number_engraver ()
 {
   text_p_ =0;
-  staffs_ = SCM_EOL;
 }
 
-
-
 					       
 void
-Bar_number_engraver::acknowledge_element (Score_element_info inf)
+Bar_number_engraver::acknowledge_grob (Grob_info inf)
 {
-  Score_element * s = inf.elem_l_;
-  if (Staff_symbol::has_interface (s))
-    {
-      staffs_ = gh_cons (inf.elem_l_->self_scm (), staffs_);
-    }
-  else if (text_p_
-	   && dynamic_cast<Item*> (s)
-	   && s->get_elt_property ("break-align-symbol") == ly_symbol2scm ("Left_edge_item"))
+  Grob * s = inf.grob_l_;
+  if (text_p_
+      && dynamic_cast<Item*> (s)
+      && s->get_grob_property ("break-align-symbol") == ly_symbol2scm ("Left_edge_item"))
     {
       /*
 	By default this would land on the Paper_column -- so why
@@ -84,12 +78,12 @@ Bar_number_engraver::acknowledge_element (Score_element_info inf)
 }
 
 void 
-Bar_number_engraver::do_pre_move_processing ()
+Bar_number_engraver::stop_translation_timestep ()
 {
   if (text_p_)
     {
-      text_p_->set_elt_property ("side-support-elements", staffs_);
-      typeset_element (text_p_);
+      text_p_->set_grob_property ("side-support-elements", get_property ("stavesFound"));
+      typeset_grob (text_p_);
       text_p_ =0;
     }
 }
@@ -101,30 +95,17 @@ Bar_number_engraver::create_items ()
   if (text_p_)
     return;
 
-  SCM b = get_property ("basicBarNumberProperties");
+  SCM b = get_property ("BarNumber");
   text_p_ = new Item (b);
-  Side_position::set_axis(text_p_,Y_AXIS);
-
-  SCM prop = get_property ("barNumberDirection");
-  if (!isdir_b (prop))
-    {
-      prop = gh_int2scm (UP);
-    }
-  text_p_->set_elt_property ("direction", prop);
-
-  SCM padding = get_property ("barNumberScriptPadding");
-  if (gh_number_p(padding))
-    {
-      text_p_->set_elt_property ("padding", padding);
-    }
-  else
-    {
-      text_p_
-	->set_elt_property ("padding",
-			    gh_double2scm(paper_l ()->get_var ("interline")));
-    }
-
+  Side_position_interface::set_axis (text_p_,Y_AXIS);
 
-  announce_element (text_p_, 0);
+  announce_grob (text_p_, 0);
 }
 
+ENTER_DESCRIPTION(Bar_number_engraver,
+/* descr */       "A bar number is created whenever measurePosition is zero. It is
+put on top of all staves, and appears only at  left side of the staff.",
+/* creats*/       "BarNumber",
+/* acks  */       "break-aligned-interface",
+/* reads */       "currentBarNumber stavesFound" ,
+/* write */       "");