X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=b6940890944166a28957ce0e1ad492af76bf6edb;hb=d1ddb3de33c8811b914cccbafdf82549c4e76034;hp=7223ebbf6a4a0cbede079a8f09fe2c75fb41f270;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 7223ebbf6a..b694089094 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -3,84 +3,70 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 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 "item.hh"
-#include "moment.hh"
 #include "engraver.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.
-
+  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_;
+  Item *text_;
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
   virtual void process_music ();
   void create_items ();
-  TRANSLATOR_DECLARATIONS(Bar_number_engraver );
+  TRANSLATOR_DECLARATIONS (Bar_number_engraver);
 };
 
-
 void
 Bar_number_engraver::process_music ()
 {
   // todo include (&&!time->cadenza_b_)
 
   SCM wb = get_property ("whichBar");
-  
-  if (gh_string_p (wb))
+
+  if (scm_is_string (wb))
     {
-      SCM smp = get_property ("measurePosition");
-      
-      Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+      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 (gh_number_p (bn) && gh_procedure_p (proc)
-	      && to_boolean(gh_call1(proc, bn)))
+	  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 (gh_scm2int (bn)).to_str0 ()));
+		("text", scm_makfrom0str (to_string (scm_to_int (bn)).to_str0 ()));
 	    }
 	}
     }
-
 }
 
-
-
 Bar_number_engraver::Bar_number_engraver ()
 {
-  text_ =0;
+  text_ = 0;
 }
 
-					       
 void
 Bar_number_engraver::acknowledge_grob (Grob_info inf)
 {
-  Grob * s = inf.grob_;
+  Grob *s = inf.grob ();
   if (text_
-      && dynamic_cast<Item*> (s)
+      && dynamic_cast<Item *> (s)
       && s->get_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
     {
       /*
@@ -90,35 +76,35 @@ Bar_number_engraver::acknowledge_grob (Grob_info inf)
     }
 }
 
-void 
+void
 Bar_number_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
       text_->set_property ("side-support-elements", get_property ("stavesFound"));
-      typeset_grob (text_);
-      text_ =0;
+
+      text_ = 0;
     }
 }
 
-
 void
 Bar_number_engraver::create_items ()
 {
   if (text_)
     return;
 
-  text_ = make_item ("BarNumber");
-  Side_position_interface::set_axis (text_,Y_AXIS);
-
-  announce_grob(text_, SCM_EOL);
+  text_ = make_item ("BarNumber", SCM_EOL);
+  Side_position_interface::set_axis (text_, Y_AXIS);
 }
 
-ENTER_DESCRIPTION(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.",
-/* creats*/       "BarNumber",
-/* accepts */     "",
-/* acks  */      "break-aligned-interface",
-/* reads */       "currentBarNumber stavesFound barNumberVisibility" ,
-/* write */       "");
+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 */ "");