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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 455690e516..4e9cc302f7 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -1,81 +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--1998 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 "script.hh"
-#include "text-def.hh"
-#include "paper-def.hh"
-#include "command-request.hh"
-#include "bar.hh"
-#include "span-bar.hh"
-#include "stem.hh"
-#include "time-description.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
 {
-  script_p_ =0;
-}
+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::acknowledge_element (Score_element_info i)
+Bar_number_engraver::process_music ()
 {
-  Bar *b =dynamic_cast <Bar *> (i.elem_l_);
-  if (script_p_ || !b)
-      return;
-
-  /* Only put numbers on bars that are at our own level (don't put
-    numbers over the staffs of a GrandStaff, only over the GrandStaff
-    itself */
-  if (i.origin_grav_l_arr_.size() != 1)
-    return;
-
-  Time_description const * time = get_staff_info().time_C_;
-  if (!time || time->cadenza_b_)
-    return;
-  
-  script_p_ = new Script;
-  Text_def *td_p = new Text_def;
-  td_p->text_str_ = to_str (time->bars_i_);
+  // todo include (&&!time->cadenza_b_)
 
-  td_p->align_dir_ = LEFT;
+  SCM wb = get_property ("whichBar");
 
-  script_p_->dir_ = UP;
-  script_p_->axis_ = Y_AXIS;
-  script_p_->specs_p_ = td_p->clone ();
-  script_p_->breakable_b_ = true;
-
-  Scalar pri = get_property ("barNumberBreakPriority");
-  if (pri.length_i () && pri.isnum_b ())
+  if (scm_is_string (wb))
     {
-      script_p_->break_priority_i_ = int (pri);
+      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 ()));
+	    }
+	}
     }
-  else
-    script_p_->break_priority_i_ = b->break_priority_i_;
+}
+
+Bar_number_engraver::Bar_number_engraver ()
+{
+  text_ = 0;
+}
 
-  Scalar padding = get_property ("barScriptPadding");
-  if (padding.length_i() && padding.isnum_b ())
+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"))
     {
-      script_p_->padding_f_ = Real(padding);
+      /*
+	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);
     }
-
-  announce_element (Score_element_info (script_p_,0));
 }
 
 void
-Bar_number_engraver::do_pre_move_processing()
+Bar_number_engraver::stop_translation_timestep ()
 {
-  if (script_p_) 
+  if (text_)
     {
-      typeset_element (script_p_);
-      script_p_ =0;
+      text_->set_property ("side-support-elements", get_property ("stavesFound"));
+
+      text_ = 0;
     }
 }
 
-IMPLEMENT_IS_TYPE_B1(Bar_number_engraver,Engraver);
-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 */ "");