X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbar-number-engraver.cc;h=4ef961ad7495cba91131a96cd20bb1264edec229;hb=de2b6d04ee98783f86b02047e41ee672f97a813d;hp=697187003c18dae059bf35f4107e0ee7af743162;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 697187003c..4ef961ad74 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -38,10 +38,6 @@ protected:
 };
 
 
-/*
-  TODO: more advanced formatting via SCM function, perhaps barnumbers
-  every 5 measures?  */
-
 void
 Bar_number_engraver::process_music ()
 {
@@ -51,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_->set_grob_property ("text",
-				      ly_str02scm (to_string (gh_scm2int (bn)).to_str0 ()));
+	  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 ()));
+	    }
 	}
     }
 
@@ -118,9 +115,10 @@ Bar_number_engraver::create_items ()
 }
 
 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.",
+/* 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",
-/* acks  */       "break-aligned-interface",
-/* reads */       "currentBarNumber stavesFound" ,
+/* accepts */     "",
+/* acks  */      "break-aligned-interface",
+/* reads */       "currentBarNumber stavesFound barNumberVisibility" ,
 /* write */       "");