source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "debug.hh"
#include "paper-def.hh"
#include "paper-column.hh" // urg
-#include "lookup.hh"
+#include "font-interface.hh"
#include "rest.hh"
#include "molecule.hh"
#include "misc.hh"
#include "group-interface.hh"
#include "spanner.hh"
#include "staff-symbol-referencer.hh"
+#include "text-item.hh"
+#include "percent-repeat-item.hh"
+
void
-Multi_measure_rest::set_interface (Score_element*me)
+Multi_measure_rest::set_interface (Grob*me)
{
me->set_interface (ly_symbol2scm ("multi-measure-rest-interface"));
}
bool
-Multi_measure_rest::has_interface (Score_element*me)
+Multi_measure_rest::has_interface (Grob*me)
{
return me->has_interface (ly_symbol2scm ("multi-measure-rest-interface"));
}
+MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1);
+SCM
+Multi_measure_rest::percent (SCM smob)
+{
+
+ Grob *me = unsmob_grob (smob);
+ Spanner *sp = dynamic_cast<Spanner*> (me);
+
+ Molecule r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6);
+
+ // ugh copy & paste.
+
+ Interval sp_iv;
+ Direction d = LEFT;
+ do
+ {
+ Item * col = sp->get_bound (d)->column_l ();
+
+ Interval coldim = col->extent (0, X_AXIS);
+
+ sp_iv[d] = coldim[-d] ;
+ }
+ while ((flip (&d)) != LEFT);
+ Real x_off = 0.0;
+
+ Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS);
/*
+ we gotta stay clear of sp_iv, so move a bit to the right if
+ needed.
+ */
+ x_off += (sp_iv[LEFT] - rx) >? 0;
+
+ /*
+ center between stuff.
+ */
+ x_off += sp_iv.length ()/ 2;
+
+ r.translate_axis (x_off,X_AXIS);
+
+
+ return r.smobbed_copy ();
+}
+
+
+/*
[TODO] 17
- * variable-sized multi-measure rest symbol: |====| ??
+ variable-sized multi-measure rest symbol: |====| ??
*/
-MAKE_SCHEME_CALLBACK(Multi_measure_rest,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Multi_measure_rest,brew_molecule,1);
SCM
Multi_measure_rest::brew_molecule (SCM smob)
{
- Score_element *me = unsmob_element (smob);
+ Grob *me = unsmob_grob (smob);
+ if (to_boolean (me->get_grob_property ("skip-timestep")))
+ {
+ me->set_grob_property ("skip-timestep", SCM_EOL);
+ return SCM_EOL;
+ }
+
Spanner * sp = dynamic_cast<Spanner*> (me);
+
+ SCM alist_chain = Font_interface::font_alist_chain (me);
+
+
+ SCM style_chain =
+ Font_interface::add_style (me, ly_symbol2scm ("mmrest-symbol"),
+ alist_chain);
+
+ Font_metric *musfont
+ = Font_interface::get_font (me,style_chain);
+
Real staff_space = Staff_symbol_referencer::staff_space (me);
Interval sp_iv;
{
Item * col = sp->get_bound (d)->column_l ();
- Interval coldim = col->extent (X_AXIS)
- + col->relative_coordinate (0, X_AXIS);
+ Interval coldim = col->extent (0, X_AXIS);
sp_iv[d] = coldim[-d] ;
}
Molecule s;
- int measures = 1;
- SCM m (me->get_elt_property ("measure-count"));
+ int measures = 0;
+ SCM m (me->get_grob_property ("measure-count"));
if (gh_number_p (m))
{
measures = gh_scm2int (m);
}
- SCM limit = me->get_elt_property ("expand-limit");
- if (measures <= gh_scm2int (limit))
+ SCM limit = me->get_grob_property ("expand-limit");
+ if (measures <= 0)
+ return SCM_EOL;
+ if (measures == 1)
+ {
+ s = musfont->find_by_name (Rest::glyph_name (me, 0, ""));
+
+ /*
+ ugh.
+ */
+ if (Staff_symbol_referencer::position_f (me) == 0.0)
+ s.translate_axis (Staff_symbol_referencer::staff_space (me), Y_AXIS);
+ }
+ else if (measures <= gh_scm2int (limit))
{
/*
Build a rest from smaller parts. Distances inbetween are
}
Real pad = s.empty_b ()
- ? 0.0 : gh_scm2double (me->get_elt_property ("padding")) * staff_space;
+ ? 0.0 : gh_scm2double (me->get_grob_property ("padding")) * staff_space;
- Molecule r (me->lookup_l ()->afm_find ("rests-" + to_str (k)));
+ Molecule r (musfont->find_by_name ("rests-" + to_str (k)));
if (k == 0)
r.translate_axis (staff_space, Y_AXIS);
}
else
{
- String idx = ("rests-") + to_str (-4);
- s = me->lookup_l ()->afm_find (idx);
+ String idx = ("rests-") + to_str (-4);
+ s = musfont->find_by_name (idx);
}
mol.add_molecule (s);
if (measures > 1)
{
- Molecule s (me->lookup_l ()->text ("number", to_str (measures), me->paper_l ()));
+ Molecule s = Text_item::text2molecule (me,
+ ly_str02scm (to_str (measures).ch_C ()),
+ alist_chain);
s.align_to (X_AXIS, CENTER);
s.translate_axis (3.0 * staff_space, Y_AXIS);
mol.add_molecule (s);
}
mol.translate_axis (x_off, X_AXIS);
- return mol.create_scheme();
+ return mol.smobbed_copy ();
}
/*
UGH. JUNKME elt prop "columns" isn't really needed.
*/
void
-Multi_measure_rest::add_column (Score_element*me,Item* c)
+Multi_measure_rest::add_column (Grob*me,Item* c)
{
- Pointer_group_interface gi (me, "columns");
- gi.add_element (c);
+ Pointer_group_interface::add_element (me, "columns",c);
add_bound_item (dynamic_cast<Spanner*> (me),c);
}
SCM
Multi_measure_rest::set_spacing_rods (SCM smob)
{
- Score_element*me = unsmob_element (smob);
+ Grob*me = unsmob_grob (smob);
Spanner*sp = dynamic_cast<Spanner*> (me);
- if (!(sp->get_bound (LEFT) && sp->get_bound (RIGHT)))
+ if (! (sp->get_bound (LEFT) && sp->get_bound (RIGHT)))
{
programming_error ("Multi_measure_rest::get_rods (): I am not spanned!");
return SCM_UNSPECIFIED;
/*
should do something more advanced.
*/
- rod.distance_f_ = l->extent (X_AXIS)[BIGGER] - r->extent (X_AXIS)[SMALLER]
- + gh_scm2double (me->get_elt_property ("minimum-width")) * staff_space;
+ rod.distance_f_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER]
+ + gh_scm2double (me->get_grob_property ("minimum-width")) * staff_space;
rod.add_to_cols ();
}
projects / lilypond.git / blobdiff