From 2886ccc5fed627d0666f8fa2da995df8b80a689f Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:13:00 +0000 Subject: [PATCH] lilypond-1.0.1 --- lily/staff-sym.cc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lily/staff-sym.cc b/lily/staff-sym.cc index d4b5f35eaf..d329e82185 100644 --- a/lily/staff-sym.cc +++ b/lily/staff-sym.cc @@ -3,14 +3,15 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--1998 Han-Wen Nienhuys */ #include "staff-sym.hh" #include "lookup.hh" #include "paper-def.hh" #include "molecule.hh" #include "debug.hh" -#include "dimen.hh" +#include "dimension.hh" +#include "item.hh" Staff_symbol::Staff_symbol () @@ -42,18 +43,25 @@ Staff_symbol::do_height() const Molecule* Staff_symbol::brew_molecule_p() const { + Real w = width ().length (); + Real left_dx = -spanned_drul_[LEFT]->extent (X_AXIS)[LEFT]; + Real right_dx = spanned_drul_[RIGHT]->extent (X_AXIS)[RIGHT]; + // w += right_dx+ left_dx; + + Paper_def * p = paper(); - Atom rule = p->lookup_l ()->rule_symbol (p->get_var ("rulethickness"), - width ().length ()); + Atom 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++) { Atom a (rule); a.translate_axis (height - i * inter_note_f()*2, Y_AXIS); - m->add (a); + m->add_molecule (a); } + // m->translate_axis (-left_dx, X_AXIS); return m; } -- 2.39.5