X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol.hh;h=3774ee3dc30af8077473d4db5cadfe0fc75b5a12;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=89dc0d63cdb474ecf4f5559fab992422754e7aeb;hpb=163503e56aa0c03d41d37fd083bdb96a6a473a11;p=lilypond.git

diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh
index 89dc0d63cd..3774ee3dc3 100644
--- a/lily/include/staff-symbol.hh
+++ b/lily/include/staff-symbol.hh
@@ -1,34 +1,32 @@
 /*
-  staffsym.hh -- declare Staff_symbol
+  staff-symbol.hh -- declare Staff_symbol
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#ifndef STAFF_SYMBOL_HH
+#define STAFF_SYMBOL_HH
 
-#ifndef STAFFSYM_HH
-#define STAFFSYM_HH
-#include "spanner.hh"
+#include "lily-proto.hh"
+#include "grob-interface.hh"
 
 /**
-  This spanner draws the lines of a pstaff.
-  The bottom line is position 0.
-  */
-class Staff_symbol : public Spanner
+   TODO: add linethickness as parameter.
+*/
+class Staff_symbol
 {
 public:
-  /// this many lines.
-  int no_lines_i_;
-  Real staff_line_leading_f_;
-  Real staff_line_leading_f ();
-  
+  static Real staff_space (Grob *);
+  static Real get_line_thickness (Grob *);
+  static Real get_ledger_line_thickness (Grob *);
   
-  Staff_symbol ();
-  int steps_i() const;
-protected:
-  VIRTUAL_COPY_CONS(Score_element);
-  virtual Molecule* do_brew_molecule_p() const;
-  virtual void do_print() const;
+  static int get_steps (Grob *);
+  static int line_count (Grob *);
+  static bool on_line (Grob *me, int pos);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));  
+  DECLARE_GROB_INTERFACE();
 };
-#endif // STAFFSYM_HH
+#endif // STAFF_SYMBOL_HH