#include "main.hh"
#include "dimensions.hh"
-#include "dimension-cache.hh"
+#include "score-element.hh"
#include "bar.hh"
#include "string.hh"
#include "molecule.hh"
#include "lookup.hh"
#include "debug.hh"
#include "all-font-metrics.hh"
+#include "item.hh"
+#include "staff-symbol-referencer.hh"
-Bar::Bar ()
-{
- set_elt_property ("breakable", SCM_BOOL_T);
-}
-
+MAKE_SCHEME_CALLBACK(Bar,brew_molecule,1);
-Real
-Bar::get_bar_size () const
+SCM
+Bar::brew_molecule (SCM smob)
{
- // Never called!
- return 0;
-}
-
+ Score_element * me = unsmob_element (smob);
-Molecule
-Bar::do_brew_molecule () const
-{
- SCM s = get_elt_property ("glyph");
- if (gh_string_p (s))
+ SCM s = me->get_elt_property ("glyph");
+ SCM barsiz_proc = me->get_elt_property ("barsize-procedure");
+ if (gh_string_p (s) && gh_procedure_p (barsiz_proc))
{
String str =ly_scm2string (s);
- if (str == "bracket")
- return staff_bracket (get_bar_size ());
- else if (str == "brace")
- return staff_brace (get_bar_size ());
- else
- return compound_barline (str, get_bar_size ());
+ SCM siz = gh_call1 (barsiz_proc, me->self_scm ());
+ Real sz = gh_scm2double (siz);
+ if (sz < 0)
+ return SCM_EOL;
+
+ return compound_barline (me, str, sz).create_scheme ();
}
- return Molecule ();
+ return SCM_EOL;
}
Molecule
-Bar::staff_bracket (Real height) const
+Bar::compound_barline (Score_element*me, String str, Real h)
{
- Paper_def* p= paper_l ();
- SCM at = gh_list (ly_symbol2scm ("bracket"),
- gh_double2scm (p->get_var("bracket_arch_angle")),
- gh_double2scm (p->get_var("bracket_arch_width")),
- gh_double2scm (p->get_var("bracket_arch_height")),
- gh_double2scm (p->get_var("bracket_width")),
- gh_double2scm (height),
- gh_double2scm (p->get_var("bracket_arch_thick")),
- gh_double2scm (p->get_var("bracket_thick")),
- SCM_UNDEFINED);
-
- Real staff_space = p->get_var ("interline");
- Box b (Interval (0, 1.5 * staff_space), Interval (-height/2,height/2));
- Molecule mol (b, at);
-
- mol.translate_axis (- mol.dim_[X_AXIS].length () / 2, X_AXIS);
- return mol;
-}
+ 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"));
-Molecule
-Bar::compound_barline (String str, Real h) const
-{
- Real kern = paper_l()->get_var ("bar_kern");
- Real thinkern = paper_l()->get_var ("bar_thinkern");
+ Real staffline = me->paper_l ()->get_var ("stafflinethickness");
- Molecule thin = simple_barline (paper_l()->get_var ("barthick_thin"), h);
- Molecule thick = simple_barline (paper_l()->get_var ("barthick_thick"), h);
- Molecule colon = lookup_l ()->afm_find ("dots-repeatcolon");
+ kern *= staffline;
+ thinkern *= staffline;
+ hair *= staffline;
+ fatline *= staffline;
+
+ Molecule thin = simple_barline (me, hair, h);
+ Molecule thick = simple_barline (me, fatline, h);
+ Molecule colon = me->lookup_l ()->afm_find ("dots-repeatcolon");
Molecule m;
if (str == "")
{
- return lookup_l ()->blank (Box (Interval(0, 0), Interval (-h/2, h/2)));
- }
- if (str == "scorepostbreak")
- {
- return simple_barline (paper_l ()->get_var ("barthick_score"), h);
+ return me->lookup_l ()->blank (Box (Interval(0, 0), Interval (-h/2, h/2)));
}
else if (str == "|")
{
return m;
}
-/*
- ugh. Suck me plenty.
- */
-Molecule
-Bar::staff_brace (Real y) const
-{
- Real staffht = paper_l ()->get_var ("staffheight");
- int staff_size = int (rint (staffht ));
-
- // URG
- Real step = 1.0;
- int minht = 2 * staff_size;
- int maxht = 7 * minht;
- int idx = int (((maxht - step) <? y - minht) / step);
- idx = idx >? 0;
-
- SCM l = ly_eval_str ("(style-to-cmr \"brace\")");
- String nm = "feta-braces";
- if (l != SCM_BOOL_F)
- nm = ly_scm2string (gh_cdr (l));
- nm += to_str (staff_size);
- SCM e =gh_list (ly_symbol2scm ("char"), gh_int2scm (idx), SCM_UNDEFINED);
- SCM at = (e);
-
- at = fontify_atom (all_fonts_global_p->find_font (nm), at);
-
- Box b ( Interval (-y/2,y/2),
- Interval (0,0));
- return Molecule(b, at);
-}
-
Molecule
-Bar::simple_barline (Real w, Real h) const
+Bar::simple_barline (Score_element*me,Real w, Real h)
{
- return lookup_l ()->filledbox (Box (Interval(0,w), Interval(-h/2, h/2)));
+ return me->lookup_l ()->filledbox (Box (Interval(0,w), Interval(-h/2, h/2)));
}
+MAKE_SCHEME_CALLBACK(Bar,before_line_breaking ,1);
-void
-Bar::before_line_breaking ()
+SCM
+Bar::before_line_breaking (SCM smob)
{
- SCM g = get_elt_property ("glyph");
- Direction bsd = break_status_dir ();
- if (gh_string_p (g))
- {
- if (bsd)
- {
- SCM breakdir = gh_int2scm (bsd);
- g = scm_eval (gh_list (ly_symbol2scm ("break-barline"),
- g,
- breakdir,
- SCM_UNDEFINED));
- }
- }
- else
+ Score_element*me=unsmob_element (smob);
+ Item * item = dynamic_cast<Item*> (me);
+
+ SCM g = me->get_elt_property ("glyph");
+ SCM orig = g;
+ Direction bsd = item->break_status_dir ();
+ if (gh_string_p (g) && bsd)
{
- g = SCM_UNDEFINED;
+ SCM proc = me->get_elt_property ("break-glyph-function");
+ g = gh_call2 (proc, g, gh_int2scm (bsd));
}
+
if (!gh_string_p (g))
{
- set_elt_property ("transparent", SCM_BOOL_T);
- set_empty (X_AXIS);
+ me->set_elt_property ("molecule-callback", SCM_BOOL_T);
+ me->set_extent_callback (SCM_EOL, X_AXIS);
+ // leave y_extent for spanbar?
}
- else
- set_elt_property ("glyph", g);
+
+ if (! gh_equal_p (g, orig))
+ me->set_elt_property ("glyph", g);
+
+
+ return SCM_UNSPECIFIED;
}
+void
+Bar::set_interface (Score_element*me)
+{
+ me->set_elt_property ("interfaces",
+ gh_cons (ly_symbol2scm ("bar-interface"), me->get_elt_property ("interfaces")));
+}
+
+bool
+Bar::has_interface (Score_element*m)
+{
+ return m && m->has_interface (ly_symbol2scm ("bar-interface"));
+}
+
+MAKE_SCHEME_CALLBACK(Bar,get_staff_bar_size,1);
+SCM
+Bar::get_staff_bar_size (SCM smob)
+{
+ Score_element*me = unsmob_element (smob);
+ Real ss = Staff_symbol_referencer::staff_space (me);
+ SCM size = me->get_elt_property ("bar-size");
+ if (gh_number_p (size))
+ return gh_double2scm (gh_scm2double(size)*ss);
+ else
+ {
+ return gh_double2scm ((Staff_symbol_referencer::line_count (me) -1) * ss);
+ }
+}
projects / lilypond.git / blobdiff