X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=4e9cc302f7a377abeba125440cc99372eb1e8c9f;hb=87d48c0b8a5c75a1476bbb88ca853de838f3c7ac;hp=bf22b44c614062ea0b0797019b8370231f2a3842;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index bf22b44c61..4e9cc302f7 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -1,45 +1,110 @@
 /*
-  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 "paper-column.hh"
+#include "output-def.hh"
+#include "side-position-interface.hh"
+#include "engraver.hh"
+#include "context.hh"
 
-#include "bar-number-engraver.hh"
-#include "timing-translator.hh"
-#include "timing-engraver.hh"
-#include "engraver-group-engraver.hh"
-#include "text-item.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.
+*/
 
-Bar_number_engraver::Bar_number_engraver()
+class Bar_number_engraver : public Engraver
 {
-  axis_ = Y_AXIS;
-  type_ = "barNumber";
-  visibility_lambda_
-    = ly_eval_str ("postbreak-only-visibility");
-}
+protected:
+  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);
+};
 
 void
-Bar_number_engraver::do_process_requests ()
+Bar_number_engraver::process_music ()
+{
+  // todo include (&&!time->cadenza_b_)
+
+  SCM wb = get_property ("whichBar");
+
+  if (scm_is_string (wb))
+    {
+      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 ()));
+	    }
+	}
+    }
+}
+
+Bar_number_engraver::Bar_number_engraver ()
 {
-  Translator *tr = daddy_grav_l ()->get_simple_translator ("Timing_engraver");
-  Timing_translator *time = dynamic_cast<Timing_translator*>(tr);
+  text_ = 0;
+}
 
-  // todo include (&&!time->cadenza_b_ )
-  SCM bn = get_property("currentBarNumber",0);
+void
+Bar_number_engraver::acknowledge_grob (Grob_info inf)
+{
+  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_->set_parent (s, X_AXIS);
+    }
+}
 
-  if (gh_number_p (bn) &&
-      !time->measure_position () && now_mom () > Moment (0))
+void
+Bar_number_engraver::stop_translation_timestep ()
+{
+  if (text_)
     {
-      create_items (0);
+      text_->set_property ("side-support-elements", get_property ("stavesFound"));
 
-      // guh.
-      text_p_->set_elt_property ("text",
-				 ly_str02scm (to_str (gh_scm2int (bn)).ch_C()));
-				 
+      text_ = 0;
     }
 }
 
-ADD_THIS_TRANSLATOR(Bar_number_engraver);
+void
+Bar_number_engraver::create_items ()
+{
+  if (text_)
+    return;
+
+  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 */ "");