release: 1.1.28

[lilypond.git] / lily / staff-sym.cc

diff --git a/lily/staff-sym.cc b/lily/staff-sym.cc
index 4e1a81d955dc6d36690dc68623bb952e98f648b1..6ac749eb3f993108a437bea8f497e9c1ddc27b78 100644 (file)
--- a/lily/staff-sym.cc
+++ b/lily/staff-sym.cc
@@ -3,56 +3,73 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "staff-sym.hh"
 #include "lookup.hh"
+#include "dimensions.hh"
 #include "paper-def.hh"
 #include "molecule.hh"
 #include "debug.hh"
+#include "item.hh"
 
 
-
-Staff_symbol::Staff_symbol (int l)
+Staff_symbol::Staff_symbol ()
 {
-    no_lines_i_ = l;
+  no_lines_i_ = 5;
+  interline_f_ =  0 PT;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Staff_symbol,Spanner);
+
 
 void
-Staff_symbol::do_print()const
+Staff_symbol::do_print() const
 {
 #ifndef NPRINT
-    Spanner::do_print();
-    DOUT << "lines: " << no_lines_i_;
+  Spanner::do_print();
+  DOUT << "lines: " << no_lines_i_;
 #endif
 }
 
-Molecule*
-Staff_symbol::brew_molecule_p() const
+Interval
+Staff_symbol::do_height() const
 {
-    Atom a  = paper()->lookup_l ()->linestaff (no_lines_i_, width ().length ());
-    return new Molecule (a);
+  int n = no_lines_i_ -1;
+//  return 2* inter_note_f () * Interval (-n, n);
+  return inter_note_f () * Interval (-n, n);
 }
 
-void
-Staff_symbol::set_extent (PCol*p1, PCol*p2)
+Molecule*
+Staff_symbol::do_brew_molecule_p() const
 {
-    assert (p1&&p2);
-    left_col_l_ = p1;
-    right_col_l_ = p2;
+  Real w = extent (X_AXIS).length ();
+  Paper_def * p = paper();
+  Molecule rule  = lookup_l ()->rule_symbol (p->get_var ("rulethickness"),
+                                            w);
+  Real height = (no_lines_i_-1) * inter_note_f();
+  Molecule * m = new Molecule;
+  for (int i=0; i < no_lines_i_; i++)
+    {
+      Molecule a (rule);
+      a.translate_axis (height - i * inter_note_f()*2, Y_AXIS);
+      m->add_molecule (a);
+    }
+
+  return m;
 }
 
 Real
-Staff_symbol::inter_note_f()const
+Staff_symbol::inter_note_f() const
 {
-    return paper()->internote_f ();
+  if (interline_f_)
+    return interline_f_/2;
+
+  return paper()->internote_f ();
 }
 
 int
 Staff_symbol::steps_i() const
 {
-    return no_lines_i_*2;
+  return no_lines_i_*2;
 }