*/
#include <math.h>
+#include "lookup.hh"
+#include "paper-column.hh"
#include "main.hh"
-#include "dimensions.hh"
-#include "score-element.hh"
+#include "grob.hh"
#include "bar.hh"
#include "string.hh"
#include "molecule.hh"
#include "paper-def.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
#include "debug.hh"
#include "all-font-metrics.hh"
#include "item.hh"
SCM
Bar::brew_molecule (SCM smob)
{
- Score_element * me = unsmob_element (smob);
+ Grob * me = unsmob_grob (smob);
- SCM s = me->get_elt_property ("glyph");
- SCM barsiz_proc = me->get_elt_property ("barsize-procedure");
+ SCM s = me->get_grob_property ("glyph");
+ SCM barsiz_proc = me->get_grob_property ("barsize-procedure");
if (gh_string_p (s) && gh_procedure_p (barsiz_proc))
{
String str =ly_scm2string (s);
if (sz < 0)
return SCM_EOL;
- return compound_barline (me, str, sz).create_scheme ();
+ return compound_barline (me, str, sz).smobbed_copy ();
}
return SCM_EOL;
}
Molecule
-Bar::compound_barline (Score_element*me, String str, Real h)
+Bar::compound_barline (Grob*me, String str, Real h)
{
- Real kern = gh_scm2double (me->get_elt_property ("kern"));
- Real thinkern = gh_scm2double (me->get_elt_property ("thin-kern"));
- Real hair = gh_scm2double (me->get_elt_property ("hair-thickness"));
- Real fatline = gh_scm2double (me->get_elt_property ("thick-thickness"));
+ Real kern = gh_scm2double (me->get_grob_property ("kern"));
+ Real thinkern = gh_scm2double (me->get_grob_property ("thin-kern"));
+ Real hair = gh_scm2double (me->get_grob_property ("hair-thickness"));
+ Real fatline = gh_scm2double (me->get_grob_property ("thick-thickness"));
Real staffline = me->paper_l ()->get_var ("stafflinethickness");
Molecule thin = simple_barline (me, hair, h);
Molecule thick = simple_barline (me, fatline, h);
- Molecule colon = me->lookup_l ()->afm_find ("dots-repeatcolon");
+ Molecule colon = Font_interface::get_default_font (me)->find_by_name ("dots-repeatcolon");
Molecule m;
if (str == "")
{
- return me->lookup_l ()->blank (Box (Interval(0, 0), Interval (-h/2, h/2)));
+ return Lookup::blank (Box (Interval(0, 0), Interval (-h/2, h/2)));
}
else if (str == "|")
{
Molecule
-Bar::simple_barline (Score_element*me,Real w, Real h)
+Bar::simple_barline (Grob*,Real w, Real h)
{
- return me->lookup_l ()->filledbox (Box (Interval(0,w), Interval(-h/2, h/2)));
+ return Lookup::filledbox (Box (Interval(0,w), Interval(-h/2, h/2)));
}
MAKE_SCHEME_CALLBACK(Bar,before_line_breaking ,1);
SCM
Bar::before_line_breaking (SCM smob)
{
- Score_element*me=unsmob_element (smob);
+ Grob*me=unsmob_grob (smob);
Item * item = dynamic_cast<Item*> (me);
- SCM g = me->get_elt_property ("glyph");
+ SCM g = me->get_grob_property ("glyph");
SCM orig = g;
Direction bsd = item->break_status_dir ();
if (gh_string_p (g) && bsd)
{
- SCM proc = me->get_elt_property ("break-glyph-function");
+ SCM proc = me->get_grob_property ("break-glyph-function");
g = gh_call2 (proc, g, gh_int2scm (bsd));
}
if (!gh_string_p (g))
{
- me->set_elt_property ("molecule-callback", SCM_BOOL_T);
+ me->set_grob_property ("molecule-callback", SCM_BOOL_T);
me->set_extent_callback (SCM_EOL, X_AXIS);
// leave y_extent for spanbar?
}
if (! gh_equal_p (g, orig))
- me->set_elt_property ("glyph", g);
+ me->set_grob_property ("glyph", g);
+
+
+ /*
+ set a (pseudo) stem-direction, so we extra space is inserted
+ between stemup and barline.
+ TODO: should check if the barline is the leftmost object of the
+ break alignment.
+ */
+ if (gh_string_p (g))
+ {
+ Grob * col = item->column_l ();
+ SCM dirlist = col->get_grob_property ("dir-list");
+ SCM scmdir = gh_int2scm (-1);
+ if (scm_memq (scmdir, dirlist) == SCM_BOOL_F)
+ {
+ dirlist = gh_cons (scmdir, dirlist);
+ col->set_grob_property ("dir-list", dirlist);
+ }
+ }
+
return SCM_UNSPECIFIED;
}
void
-Bar::set_interface (Score_element*me)
+Bar::set_interface (Grob*me)
{
- me->set_elt_property ("interfaces",
- gh_cons (ly_symbol2scm ("bar-interface"), me->get_elt_property ("interfaces")));
+ me->set_interface (ly_symbol2scm ("bar-line-interface"));
}
bool
-Bar::has_interface (Score_element*m)
+Bar::has_interface (Grob*m)
{
- return m && m->has_interface (ly_symbol2scm ("bar-interface"));
+ return m && m->has_interface (ly_symbol2scm ("bar-line-interface"));
}
SCM
Bar::get_staff_bar_size (SCM smob)
{
- Score_element*me = unsmob_element (smob);
+ Grob*me = unsmob_grob (smob);
Real ss = Staff_symbol_referencer::staff_space (me);
- SCM size = me->get_elt_property ("bar-size");
+ SCM size = me->get_grob_property ("bar-size");
if (gh_number_p (size))
return gh_double2scm (gh_scm2double(size)*ss);
else