X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-number-engraver.cc;h=88055cb0bbf00702476370ef8155e012d62627e2;hb=8f125843bd58e1985cf42a4b249b48a8c2f3db9b;hp=1715fde5ded9c9eb23640871695f339173dc95d2;hpb=02ad2d3bb642d9228c4ae69efc71a74bd222575f;p=lilypond.git

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 1715fde5de..88055cb0bb 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -1,45 +1,138 @@
 /*
-  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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "paper-column.hh"
+#include "output-def.hh"
+#include "side-position-interface.hh"
+#include "engraver.hh"
+#include "context.hh"
+#include "grob-array.hh"
 
-#include "bar-number-engraver.hh"
-#include "timing-translator.hh"
-#include "timing-engraver.hh"
-#include "engraver-group-engraver.hh"
-#include "text-item.hh"
+#include "translator.icc"
 
-Bar_number_engraver::Bar_number_engraver()
+/*
+  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_;
+protected:
+  void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (break_aligned);
+  DECLARE_ACKNOWLEDGER (break_alignment);
+  void process_music ();
+  void create_items ();
+  TRANSLATOR_DECLARATIONS (Bar_number_engraver);
+};
+
+void
+Bar_number_engraver::process_music ()
 {
-  axis_ = Y_AXIS;
-  type_ = "barNumber";
+  // 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_is_procedure (proc)
+	      && to_boolean (scm_call_1 (proc, bn)))
+	    {
+	      create_items ();
+	      // guh.
+	      text_->set_property
+		("text", scm_number_to_string (bn, scm_from_int (10)));
+	    }
+	}
+    }
 }
 
+Bar_number_engraver::Bar_number_engraver ()
+{
+  text_ = 0;
+}
 
 
+/*
+  see rehearsal mark comments.
+ */
 void
-Bar_number_engraver::do_process_requests ()
+Bar_number_engraver::acknowledge_break_aligned (Grob_info inf)
 {
-  Translator *tr = daddy_grav_l ()->get_simple_translator ("Timing_engraver");
-  Timing_translator *time = dynamic_cast<Timing_translator*>(tr);
+  Grob *s = inf.grob ();
+  if (text_
+      && !text_->get_parent (X_AXIS)
+      && dynamic_cast<Item *> (s)
+      && (s->get_property_data ("break-align-symbol")
+	  == text_->get_property_data ("break-align-symbol")))
+    {
+      /*
+	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);
+    }
+}
 
-  // todo include (&&!time->cadenza_b_ )
-  SCM bn = get_property("currentBarNumber");
 
-  if (gh_number_p (bn) &&
-      !time->measure_position () && now_mom () > Moment (0))
+void
+Bar_number_engraver::acknowledge_break_alignment (Grob_info inf)
+{
+  Grob *s = inf.grob ();
+  if (text_
+      && dynamic_cast<Item *> (s))
     {
-      create_items (0);
+      text_->set_parent (s, X_AXIS);
+    }
+}
 
-      // guh.
-      text_p_->set_elt_property ("text",
-				 ly_str02scm (to_str (gh_scm2int (bn)).ch_C()));
-				 
+void
+Bar_number_engraver::stop_translation_timestep ()
+{
+  if (text_)
+    {
+      text_->set_object ("side-support-elements",
+			 grob_list_to_grob_array (get_property ("stavesFound")));
+      text_ = 0;
     }
 }
 
-ADD_THIS_TRANSLATOR(Bar_number_engraver);
+void
+Bar_number_engraver::create_items ()
+{
+  if (text_)
+    return;
+
+  text_ = make_item ("BarNumber", SCM_EOL);
+}
+
+
+ADD_ACKNOWLEDGER(Bar_number_engraver,break_aligned);
+ADD_ACKNOWLEDGER(Bar_number_engraver,break_alignment);
+
+ADD_TRANSLATOR (Bar_number_engraver,
+		/* doc */ "A bar number is created whenever measurePosition "
+		"is zero and when there is a bar line (ie. when @code{whichBar} is set. "
+		"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}}. ",
+
+		/* create */ "BarNumber",
+		/* read */
+		"currentBarNumber "
+		"whichBar "
+		"stavesFound "
+		"barNumberVisibility ",
+		/* write */ "");