(accidental): NL

[lilypond.git] / lily / staff-symbol-engraver.cc

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 520bcc701ddef5a33301b8a0502d4b76e0b35ac9..c3bc1c763cb0c246dfe14f3d602ad496ef4a7787 100644 (file)
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -3,78 +3,111 @@
 
   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 "score.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "side-position-interface.hh"
 #include "engraver.hh"
 #include "moment.hh"
 
 /**
-  Manage the staff symbol.
- */
-class Staff_symbol_engraver : public Engraver { 
-  Spanner *span_p_;
+   Manage the staff symbol.
+*/
+class Staff_symbol_engraver : public Engraver
+{
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Staff_symbol_engraver();
-  
+  TRANSLATOR_DECLARATIONS (Staff_symbol_engraver);
+
 protected:
-  virtual ~Staff_symbol_engraver();
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_removal_processing();
-  virtual void do_creation_processing();
-};
+  Spanner *span_;
 
+  virtual ~Staff_symbol_engraver ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void finalize ();
+  virtual void process_music ();
+};
 
-Staff_symbol_engraver::~Staff_symbol_engraver()
+Staff_symbol_engraver::~Staff_symbol_engraver ()
 {
-  assert (!span_p_);
+  assert (!span_);
 }
 
-Staff_symbol_engraver::Staff_symbol_engraver()
+Staff_symbol_engraver::Staff_symbol_engraver ()
 {
-  span_p_ = 0;
+  span_ = 0;
 }
 
 void
-Staff_symbol_engraver::do_creation_processing()
+Staff_symbol_engraver::process_music ()
 {
-  span_p_ = new Spanner (get_property ("StaffSymbol"));
-  
-  span_p_->set_bound(LEFT, unsmob_element (get_property ("currentCommandColumn")));
+  if (!span_)
+    {
+      span_ = make_spanner ("StaffSymbol", SCM_EOL);
+
+      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
+}
 
-  announce_element (span_p_, 0);
+void
+Staff_symbol_engraver::finalize ()
+{
+  if (span_)
+    {
+      span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
+  span_ = 0;
 }
 
 void
-Staff_symbol_engraver::do_removal_processing()
+Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 {
-  span_p_->set_bound(RIGHT,unsmob_element (get_property ("currentCommandColumn")));
-  typeset_element (span_p_);
-  span_p_ =0;
+  s.grob_->set_property ("staff-symbol", span_->self_scm ());
 }
 
+ADD_TRANSLATOR (Staff_symbol_engraver,
+               /* descr */ "Create the constellation of five (default) "
+               "staff lines.",
+               /* creats*/ "StaffSymbol",
+               /* accepts */ "",
+               /* acks  */ "grob-interface",
+               /* reads */ "",
+               /* write */ "");
+
+/****************************************************************/
+
+class Tab_staff_symbol_engraver : public Staff_symbol_engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS (Tab_staff_symbol_engraver);
+protected:
+  virtual void process_music ();
+};
+
 void
-Staff_symbol_engraver::acknowledge_element (Score_element_info s)
+Tab_staff_symbol_engraver::process_music ()
 {
-  //////  assert (span_p_);
-  ////// ik weet 't zo onderhand echt niet meer
-  ///// if (!span_p_)
-  /////  do_creation_processing ();
-  if (!span_p_)
+  bool init = !span_;
+  Staff_symbol_engraver::process_music ();
+  if (init)
     {
-      status_ = VIRGIN;
-      creation_processing ();
+      int k = scm_ilength (get_property ("stringTunings"));
+      if (k >= 0)
+       span_->set_property ("line-count", scm_int2num (k));
     }
-    s.elem_l_->set_elt_property ("staff-symbol", span_p_->self_scm ());
-  s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH
 }
 
+Tab_staff_symbol_engraver::Tab_staff_symbol_engraver ()
+{
+}
 
-ADD_THIS_TRANSLATOR(Staff_symbol_engraver);
-
+ADD_TRANSLATOR (Tab_staff_symbol_engraver,
+               /* descr */ "Create a staff-symbol, but look at stringTunings for the number of lines."
+               "staff lines.",
+               /* creats*/ "StaffSymbol",
+               /* accepts */ "",
+               /* acks  */ "grob-interface",
+               /* reads */ "stringTunings",
+               /* write */ "");