#include "grob.hh"
#include "bar-line.hh"
#include "string.hh"
-#include "molecule.hh"
+#include "stencil.hh"
#include "paper-def.hh"
#include "font-interface.hh"
{
Grob * me = unsmob_grob (smob);
- SCM s = me->get_grob_property ("glyph");
- SCM barsiz_proc = me->get_grob_property ("bar-size-procedure");
+ SCM s = me->get_property ("glyph");
+ SCM barsiz_proc = me->get_property ("bar-size-procedure");
if (gh_string_p (s) && gh_procedure_p (barsiz_proc))
{
String str =ly_scm2string (s);
}
-Molecule
+Stencil
Bar_line::compound_barline (Grob*me, String str, Real h)
{
- Real kern = robust_scm2double (me->get_grob_property ("kern"), 1);
- Real thinkern = robust_scm2double (me->get_grob_property ("thin-kern"), 1);
- Real hair = robust_scm2double (me->get_grob_property ("hair-thickness"), 1);
- Real fatline = robust_scm2double (me->get_grob_property ("thick-thickness"), 1);
+ Real kern = robust_scm2double (me->get_property ("kern"), 1);
+ Real thinkern = robust_scm2double (me->get_property ("thin-kern"), 1);
+ Real hair = robust_scm2double (me->get_property ("hair-thickness"), 1);
+ Real fatline = robust_scm2double (me->get_property ("thick-thickness"), 1);
Real staffline = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
Real staff_space = Staff_symbol_referencer::staff_space (me);
hair *= staffline;
fatline *= staffline;
- Molecule thin = simple_barline (me, hair, h);
- Molecule thick = simple_barline (me, fatline, h);
- Molecule dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
+ Stencil thin = simple_barline (me, hair, h);
+ Stencil thick = simple_barline (me, fatline, h);
+ Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
Real dist = ( Staff_symbol_referencer::line_count (me) & 1 ? 1 :
(staff_space<2 ? 2 : .5) ) * staff_space;
- Molecule colon (dot);
- colon.translate_axis(dist,Y_AXIS);
- colon.add_molecule(dot);
- colon.translate_axis(-dist/2,Y_AXIS);
+ Stencil colon (dot);
+ colon.translate_axis (dist,Y_AXIS);
+ colon.add_stencil (dot);
+ colon.translate_axis (-dist/2,Y_AXIS);
- Molecule m;
+ Stencil m;
if (str == "")
{
for (int i = 0 ; i < c - 1; i++)
{
Real y = (- (c-1.0) / 2 + 0.5 + i * staff_space);
- Molecule d (dot);
+ Stencil d (dot);
d. translate_axis (y,Y_AXIS);
- m.add_molecule (d);
+ m.add_stencil (d);
}
}
return m;
}
-Molecule
+Stencil
Bar_line::simple_barline (Grob *me,Real w, Real h)
{
Real blot = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
Grob*me=unsmob_grob (smob);
Item * item = dynamic_cast<Item*> (me);
- SCM g = me->get_grob_property ("glyph");
+ SCM g = me->get_property ("glyph");
SCM orig = g;
Direction bsd = item->break_status_dir ();
if (gh_string_p (g) && bsd)
{
- SCM proc = me->get_grob_property ("break-glyph-function");
+ SCM proc = me->get_property ("break-glyph-function");
g = gh_call2 (proc, g, scm_int2num (bsd));
}
if (!gh_string_p (g))
{
- me->set_grob_property ("print-function", SCM_EOL);
+ me->set_property ("print-function", SCM_EOL);
me->set_extent (SCM_EOL, X_AXIS);
// leave y_extent for spanbar?
}
if (! gh_equal_p (g, orig))
- me->set_grob_property ("glyph", g);
+ me->set_property ("glyph", g);
return SCM_UNSPECIFIED;
}
{
Grob*me = unsmob_grob (smob);
Real ss = Staff_symbol_referencer::staff_space (me);
- SCM size = me->get_grob_property ("bar-size");
+ SCM size = me->get_property ("bar-size");
if (gh_number_p (size))
return gh_double2scm (gh_scm2double (size)*ss);
else if (Staff_symbol_referencer::get_staff_symbol (me))