(c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "molecule.hh"
+#include "stencil.hh"
#include "paper-def.hh"
#include "font-interface.hh"
#include "rest.hh"
#include "dots.hh"
#include "paper-score.hh"
#include "staff-symbol-referencer.hh"
+#include "directional-element-interface.hh"
// -> offset callback
MAKE_SCHEME_CALLBACK (Rest,after_line_breaking,1);
Rest::after_line_breaking (SCM smob)
{
Grob *me = unsmob_grob (smob);
- int bt = gh_scm2int (me->get_grob_property ("duration-log"));
+ int bt = gh_scm2int (me->get_property ("duration-log"));
int lc = Staff_symbol_referencer::line_count (me);
Real ss = Staff_symbol_referencer::staff_space (me);
- if(lc % 2)
+ if (lc % 2)
{
if (bt == 0 && lc > 1)
{
me->translate_axis (ss/2 , Y_AXIS);
}
- Grob * d = unsmob_grob (me->get_grob_property ("dot"));
+ Grob * d = unsmob_grob (me->get_property ("dot"));
if (d && bt > 4) // UGH.
{
- d->set_grob_property ("staff-position",
+ d->set_property ("staff-position",
gh_int2scm ((bt == 7) ? 4 : 3));
}
if (d && bt >= -1 && bt <= 1) // UGH again.
{
- d->set_grob_property ("staff-position",
+ d->set_property ("staff-position",
gh_int2scm ((bt == 0) ? -1 : 1));
}
return SCM_UNSPECIFIED;
MAKE_SCHEME_CALLBACK (Rest,print,1);
SCM
-Rest::brew_internal_molecule (SCM smob)
+Rest::brew_internal_stencil (SCM smob)
{
Grob* me = unsmob_grob (smob);
- SCM balltype_scm = me->get_grob_property ("duration-log");
+ SCM balltype_scm = me->get_property ("duration-log");
if (!gh_number_p (balltype_scm))
- return Molecule ().smobbed_copy ();
+ return Stencil ().smobbed_copy ();
int balltype = gh_scm2int (balltype_scm);
String style;
- SCM style_scm = me->get_grob_property ("style");
+ SCM style_scm = me->get_property ("style");
if (gh_symbol_p (style_scm))
{
style = ly_scm2string (scm_symbol_to_string (style_scm));
Font_metric *fm = Font_interface::get_default_font (me);
String font_char = glyph_name (me, balltype, style);
- Molecule out = fm->find_by_name (font_char);
+ Stencil out = fm->find_by_name (font_char);
if (out.is_empty ())
{
me->warning (_f ("rest `%s' not found, ", font_char.to_str0 ()));
}
- return out.smobbed_copy();
+ return out.smobbed_copy ();
}
SCM
Rest::print (SCM smob)
{
- return brew_internal_molecule (smob);
+ return brew_internal_stencil (smob);
}
MAKE_SCHEME_CALLBACK (Rest,extent_callback,2);
/*
- We need the callback. The real molecule has ledgers depending on
+ We need the callback. The real stencil has ledgers depending on
Y-position. The Y-position is known only after line breaking. */
SCM
Rest::extent_callback (SCM smob, SCM ax)
{
Axis a = (Axis) gh_scm2int (ax);
- SCM m = brew_internal_molecule (smob);
- return ly_interval2scm (unsmob_molecule (m)->extent (a));
+ SCM m = brew_internal_stencil (smob);
+ return ly_interval2scm (unsmob_stencil (m)->extent (a));
}
-
+MAKE_SCHEME_CALLBACK (Rest,polyphonic_offset_callback,2);
+SCM
+Rest::polyphonic_offset_callback (SCM smob, SCM)
+{
+ Grob* me = unsmob_grob (smob);
+ if (gh_number_p (me->get_property ("staff-position")))
+ return gh_double2scm (0);
+
+ Direction d = get_grob_direction (me);
+ Real off = 2* d ;
+ if (off)
+ off *= Staff_symbol_referencer::staff_space (me);
+ return gh_double2scm (off);
+}
ADD_INTERFACE (Rest,"rest-interface",
- "a rest",
+ "A rest symbol.",
"style minimum-distance");