release: 1.3.74

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 2d0412f42741fb4b8a12e8da47820a03a761deb5..34a0cb2eae3228113aa22b72c3212cd03c693f43 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -3,79 +3,128 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
-#include "bar-number-engraver.hh"
-#include "script.hh"
-#include "text-def.hh"
+#include "lily-guile.hh"
+#include "paper-column.hh"
 #include "paper-def.hh"
-#include "command-request.hh"
-#include "bar.hh"
-#include "span-bar.hh"
-#include "stem.hh"
-#include "time-description.hh"
-
-Bar_number_engraver::Bar_number_engraver()
+#include "side-position-interface.hh"
+#include "staff-symbol.hh"
+#include "item.hh"
+#include "moment.hh"
+#include "engraver.hh"
+#include "protected-scm.hh"
+
+class Bar_number_engraver : public Engraver
 {
-  script_p_ =0;
-}
+protected:
+  Item* text_p_;
+
+  Protected_scm staffs_;
+
+protected:
+  virtual void do_pre_move_processing ();
+  virtual void acknowledge_element (Score_element_info);
+  void create_items();
+  void do_process_music ();
+public:
+  VIRTUAL_COPY_CONS(Translator);
+  Bar_number_engraver();
+};
 
 void
-Bar_number_engraver::acknowledge_element (Score_element_info i)
+Bar_number_engraver::do_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;
+  // todo include (&&!time->cadenza_b_ )
+  SCM bn = get_property("currentBarNumber");
+  SCM smp = get_property ("measurePosition");
+  Moment mp =  (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
   
-  script_p_ = new Script;
-  Text_def *td_p = new Text_def;
-  td_p->text_str_ = to_str (time->bars_i_);
+  if (gh_number_p (bn) &&
+      !mp && now_mom () > Moment (0))
+    {
+      create_items ();
 
-  td_p->align_dir_ = LEFT;
+      // guh.
+      text_p_->set_elt_property ("text",
+                                ly_str02scm (to_str (gh_scm2int (bn)).ch_C()));
+    }
+}
+
+ADD_THIS_TRANSLATOR(Bar_number_engraver);
+
+Bar_number_engraver::Bar_number_engraver ()
+{
+  text_p_ =0;
+  staffs_ = SCM_EOL;
+}
 
-  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", 0);
-  if (pri.length_i () && pri.isnum_b ())
+
+                                              
+void
+Bar_number_engraver::acknowledge_element (Score_element_info inf)
+{
+  Score_element * s = inf.elem_l_;
+  if (Staff_symbol::has_interface (s))
     {
-      script_p_->break_priority_i_ = int (pri);
+      staffs_ = gh_cons (inf.elem_l_->self_scm (), staffs_);
     }
-  else
-    script_p_->break_priority_i_ = b->break_priority_i_;
-
-  Scalar padding = get_property ("barScriptPadding", 0);
-  if (padding.length_i() && padding.isnum_b ())
+  else if (text_p_
+          && dynamic_cast<Item*> (s)
+          && s->get_elt_property ("break-align-symbol") == ly_symbol2scm ("Left_edge_item"))
     {
-      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_p_->set_parent (s, X_AXIS);
     }
+}
 
-  announce_element (Score_element_info (script_p_,0));
+void 
+Bar_number_engraver::do_pre_move_processing ()
+{
+  if (text_p_)
+    {
+      text_p_->set_elt_property ("side-support-elements", staffs_);
+      typeset_element (text_p_);
+      text_p_ =0;
+    }
 }
 
+
 void
-Bar_number_engraver::do_pre_move_processing()
+Bar_number_engraver::create_items ()
 {
-  if (script_p_) 
+  if (text_p_)
+    return;
+
+  SCM b = get_property ("basicBarNumberProperties");
+  text_p_ = new Item (b);
+  Side_position::set_axis(text_p_,Y_AXIS);
+
+  SCM prop = get_property ("barNumberDirection");
+  if (!isdir_b (prop))
     {
-      typeset_element (script_p_);
-      script_p_ =0;
+      prop = gh_int2scm (UP);
     }
-}
+  text_p_->set_elt_property ("direction", prop);
 
+  SCM padding = get_property ("barNumberScriptPadding");
+  if (gh_number_p(padding))
+    {
+      text_p_->set_elt_property ("padding", padding);
+    }
+  else
+    {
+      text_p_
+       ->set_elt_property ("padding",
+                           gh_double2scm(paper_l ()->get_var ("interline")));
+    }
+
+
+  announce_element (text_p_, 0);
+}
 
-ADD_THIS_TRANSLATOR(Bar_number_engraver);