* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 614b750e61d13c4fff5357f4a364ebcad323514b..10eb2f45513e9ccc316c0c4948488264d01b4aea 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -1,5 +1,5 @@
 /*
-  bar-number-grav.cc -- implement Bar_number_engraver
+  bar-number-engraver.cc -- implement Bar_number_engraver
 
   source file of the GNU LilyPond music typesetter
 
@@ -16,11 +16,19 @@
 #include "engraver.hh"
 #include "translator-group.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_;
+  Item* text_;
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
@@ -30,10 +38,6 @@ protected:
 };
 
 
-/*
-  TODO: more advanced formatting via SCM function, perhaps barnumbers
-  every 5 measures?  */
-
 void
 Bar_number_engraver::process_music ()
 {
@@ -43,19 +47,20 @@ Bar_number_engraver::process_music ()
   
   if (gh_string_p (wb))
     {
-      SCM bn = get_property ("currentBarNumber");
       SCM smp = get_property ("measurePosition");
-      int ibn = gh_number_p (bn) ? gh_scm2int(bn) : 1;
       
       Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
-      if (mp.main_part_ == Rational (0)
-         && ibn != 1)
+      if (mp.main_part_ == Rational (0))
        {
-         create_items ();
-         
-         // guh.
-         text_p_->set_grob_property ("text",
-                                     ly_str02scm (to_str (gh_scm2int (bn)).ch_C ()));
+         SCM bn = get_property ("currentBarNumber");
+         SCM proc = get_property ("barNumberVisibility");
+         if (gh_number_p (bn) && to_boolean(gh_call1(proc, bn)))
+           {
+             create_items ();
+             // guh.
+             text_->set_grob_property
+               ("text", scm_makfrom0str (to_string (gh_scm2int (bn)).to_str0 ()));
+           }
        }
     }
 
@@ -65,33 +70,33 @@ Bar_number_engraver::process_music ()
 
 Bar_number_engraver::Bar_number_engraver ()
 {
-  text_p_ =0;
+  text_ =0;
 }
 
                                               
 void
 Bar_number_engraver::acknowledge_grob (Grob_info inf)
 {
-  Grob * s = inf.grob_l_;
-  if (text_p_
+  Grob * s = inf.grob_;
+  if (text_
       && dynamic_cast<Item*> (s)
-      && s->get_grob_property ("break-align-symbol") == ly_symbol2scm ("Left_edge_item"))
+      && s->get_grob_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::stop_translation_timestep ()
 {
-  if (text_p_)
+  if (text_)
     {
-      text_p_->set_grob_property ("side-support-elements", get_property ("stavesFound"));
-      typeset_grob (text_p_);
-      text_p_ =0;
+      text_->set_grob_property ("side-support-elements", get_property ("stavesFound"));
+      typeset_grob (text_);
+      text_ =0;
     }
 }
 
@@ -99,14 +104,14 @@ Bar_number_engraver::stop_translation_timestep ()
 void
 Bar_number_engraver::create_items ()
 {
-  if (text_p_)
+  if (text_)
     return;
 
   SCM b = get_property ("BarNumber");
-  text_p_ = new Item (b);
-  Side_position_interface::set_axis (text_p_,Y_AXIS);
+  text_ = new Item (b);
+  Side_position_interface::set_axis (text_,Y_AXIS);
 
-  announce_grob(text_p_, SCM_EOL);
+  announce_grob(text_, SCM_EOL);
 }
 
 ENTER_DESCRIPTION(Bar_number_engraver,