X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=6ef193e2ebde5fa40abb8547ced1638df00e7e17;hb=5c7d64ab0b4877bc8a659194034b7b74522f3d6c;hp=13b50e0a6e48b0bc12675fbf804710f6e45da9a6;hpb=c52973e438ce3490d688860bb71849a7b3c26fef;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 13b50e0a6e..6ef193e2eb 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -1,101 +1,97 @@
 /*
-  bar-number-grav.cc -- implement Bar_number_engraver
+  bar-number-engraver.cc -- implement Bar_number_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
-#include "lily-guile.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-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 "context.hh"
+
+/*
+  
+TODO: detect the top staff (stavesFound), and acknowledge staff-group
+system-start-delims. If we find these, and the top staff is in the
+staff-group, add padding to the bar number.
+
+*/
+
 
 class Bar_number_engraver : public Engraver
 {
 protected:
-  Item* text_p_;
-
-  Protected_scm staffs_;
-
+  Item* text_;
 protected:
-  virtual void do_creation_processing ();
-  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 process_music ();
+  void create_items ();
+  TRANSLATOR_DECLARATIONS (Bar_number_engraver );
 };
 
+
 void
-Bar_number_engraver::do_process_music ()
+Bar_number_engraver::process_music ()
 {
-  // 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);
+  // todo include (&&!time->cadenza_b_)
+
+  SCM wb = get_property ("whichBar");
   
-  if (gh_number_p (bn) &&
-      !mp && now_mom () > Moment (0))
+  if (scm_is_string (wb))
     {
-      create_items ();
-
-      // guh.
-      text_p_->set_elt_property ("text",
-				 ly_str02scm (to_str (gh_scm2int (bn)).ch_C()));
+      Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
+      if (mp.main_part_ == Rational (0))
+	{
+	  SCM bn = get_property ("currentBarNumber");
+	  SCM proc = get_property ("barNumberVisibility");
+	  if (scm_is_number (bn) && ly_c_procedure_p (proc)
+	      && to_boolean (scm_call_1(proc, bn)))
+	    {
+	      create_items ();
+	      // guh.
+	      text_->set_property
+		("text", scm_makfrom0str (to_string (scm_to_int (bn)).to_str0 ()));
+	    }
+	}
     }
+
 }
 
-ADD_THIS_TRANSLATOR(Bar_number_engraver);
 
-Bar_number_engraver::Bar_number_engraver ()
-{
-  text_p_ =0;
-  staffs_ = SCM_EOL;
-}
 
-void
-Bar_number_engraver::do_creation_processing ()
+Bar_number_engraver::Bar_number_engraver ()
 {
+  text_ = 0;
 }
 
-
 					       
 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 (dynamic_cast<Staff_symbol*> (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_;
+  if (text_
+      && dynamic_cast<Item*> (s)
+      && s->get_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
     {
       /*
 	By default this would land on the Paper_column -- so why
 	doesn't it work when you leave this out?  */
-      text_p_->set_parent (s, X_AXIS);
+      text_->set_parent (s, X_AXIS);
     }
 }
 
 void 
-Bar_number_engraver::do_pre_move_processing ()
+Bar_number_engraver::stop_translation_timestep ()
 {
-  if (text_p_)
+  if (text_)
     {
-      text_p_->set_elt_pointer ("side-support-elements", staffs_);
-      typeset_element (text_p_);
-      text_p_ =0;
+      text_->set_property ("side-support-elements", get_property ("stavesFound"));
+      
+      text_ = 0;
     }
 }
 
@@ -103,34 +99,22 @@ Bar_number_engraver::do_pre_move_processing ()
 void
 Bar_number_engraver::create_items ()
 {
-  if (text_p_)
+  if (text_)
     return;
 
-  SCM b = get_property ("basicBarNumberProperties");
-  text_p_ = new Item (b);
-  Side_position_interface staffside(text_p_);
-  staffside.set_axis (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")));
-    }
-
-
-  announce_element (Score_element_info (text_p_, 0));
+  text_ = make_item ("BarNumber", SCM_EOL);
+  Side_position_interface::set_axis (text_, Y_AXIS);
 }
 
+ADD_TRANSLATOR (Bar_number_engraver,
+/* descr */       "A bar number is created whenever measurePosition is zero. It is\n"
+		   "put on top of all staves, and appears only at  left side of the staff. "
+		   "The staves are taken from @code{stavesFound}, which is maintained by "
+		   "@code{@ref{Staff_collecting_engraver}}. "
+		   ,
+		   
+/* creats*/       "BarNumber",
+/* accepts */     "",
+/* acks  */      "break-aligned-interface",
+/* reads */       "currentBarNumber stavesFound barNumberVisibility" ,
+/* write */       "");