*/
#include "multi-measure-rest.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "paper-def.hh"
#include "paper-column.hh" // urg
#include "font-interface.hh"
#include "percent-repeat-item.hh"
#include "lookup.hh"
-bool
-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
Direction d = LEFT;
do
{
- Item * col = sp->get_bound (d)->column_l ();
+ Item * col = sp->get_bound (d)->get_column ();
Interval coldim = col->extent (0, X_AXIS);
Interval sp_iv;
Direction d = LEFT;
+
+ Grob *common = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
do
{
- Item * col = sp->get_bound (d)->column_l ();
+ Item * col = sp->get_bound (d)->get_column ();
- Interval coldim = col->extent (0, X_AXIS);
+ Interval coldim = col->extent (common, X_AXIS);
sp_iv[d] = coldim[-d] ;
}
while ((flip (&d)) != LEFT);
- Molecule mol;
- Real x_off = 0.0;
+
+ Real space = sp_iv.length();
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;
+ Real x_off = (sp_iv[LEFT] - rx) >? 0;
- /*
- center between stuff.
- */
- x_off += sp_iv.length ()/ 2;
- mol.add_molecule (symbol_molecule (me));
+ Molecule mol;
+ mol.add_molecule (symbol_molecule (me, space));
int measures = 0;
SCM m (me->get_grob_property ("measure-count"));
measures = gh_scm2int (m);
}
- if (measures > 1)
+ SCM s = me->get_grob_property ("number-threshold");
+ if (measures > gh_scm2int (s))
{
Molecule s = Text_item::text2molecule (me,
- ly_str02scm (to_str (measures).ch_C ()),
+ scm_makfrom0str (to_string (measures).to_str0 ()),
alist_chain);
+
s.align_to (X_AXIS, CENTER);
- s.translate_axis (3.0, Y_AXIS);
+ s.translate_axis (gh_scm2double (me->get_grob_property ("padding")) + 2,
+ Y_AXIS);
+
+ s.translate_axis (mol.extent (X_AXIS).center (), X_AXIS);
mol.add_molecule (s);
}
mol.translate_axis (x_off, X_AXIS);
Molecule
-Multi_measure_rest::symbol_molecule (Grob *me)
+Multi_measure_rest::symbol_molecule (Grob *me, Real space)
{
+ int measures = 0;
+ SCM m (me->get_grob_property ("measure-count"));
+ if (gh_number_p (m))
+ {
+ measures = gh_scm2int (m);
+ }
+ if (measures <= 0)
+ return Molecule();
+
+
+ SCM limit = me->get_grob_property ("expand-limit");
+ if (measures > gh_scm2int (limit))
+ {
+ Real padding = 0.15;
+ Molecule s = big_rest (me, (1.0 - 2*padding) * space);
+ s.translate_axis (padding * space, X_AXIS);
+ return s;
+ }
+
SCM alist_chain = Font_interface::font_alist_chain (me);
SCM style_chain =
Real staff_space = Staff_symbol_referencer::staff_space (me);
Font_metric *musfont
= Font_interface::get_font (me,style_chain);
- Molecule s;
- int measures = 0;
- SCM m (me->get_grob_property ("measure-count"));
- if (gh_number_p (m))
- {
- measures = gh_scm2int (m);
- }
-
+ SCM sml = me->get_grob_property ("use-breve-rest");
- SCM limit = me->get_grob_property ("expand-limit");
- if (measures <= 0)
- return s;
if (measures == 1)
{
- s = musfont->find_by_name (Rest::glyph_name (me, 0, ""));
+ if (sml == SCM_BOOL_T)
+ {
+ Molecule s = musfont->find_by_name (Rest::glyph_name (me, -1, ""));
- /*
- ugh.
- */
- if (Staff_symbol_referencer::position_f (me) == 0.0)
- s.translate_axis (staff_space, Y_AXIS);
- }
- else if (measures <= gh_scm2int (limit))
- {
- Real pad = gh_scm2double (me->get_grob_property ("padding")) * staff_space;
- s = church_rest (musfont, measures, staff_space, pad);
+ s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS);
+
+ return s ;
+ }
+ else
+ {
+ Molecule s = musfont->find_by_name (Rest::glyph_name (me, 0, ""));
+
+ /*
+ ugh.
+ */
+ if (Staff_symbol_referencer::get_position (me) == 0.0)
+ s.translate_axis (staff_space, Y_AXIS);
+
+ s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS);
+
+ return s ;
+ }
}
- else
+ else
{
- Real w = gh_scm2double (me->get_grob_property ("width"));
- s = big_rest (me, w);
+ return church_rest (me, musfont, measures, space);
}
- return s;
}
+
+
Molecule
Multi_measure_rest::big_rest (Grob *me, Real width)
{
Real thick = gh_scm2double (me->get_grob_property ("thickness"));
Real ss = Staff_symbol_referencer::staff_space (me);
- Real slt = me->paper_l ()->get_var ("stafflinethickness");
+ Real slt = me->get_paper ()->get_var ("linethickness");
Real y = slt * thick/2 * ss;
Box b(Interval (0, width), Interval (-y, y));
Real ythick = slt * ss;
m.add_at_edge (X_AXIS, RIGHT, yb, -ythick);
m.add_at_edge (X_AXIS, LEFT, yb, -ythick);
- m.align_to (X_AXIS, CENTER);
+ m.align_to (X_AXIS, LEFT);
return m;
}
/*
Kirchenpause (?)
-
*/
Molecule
-Multi_measure_rest::church_rest (Font_metric *musfont, int measures,
- Real staff_space, Real padding)
+Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures,
+ Real space)
{
- Molecule s;
- /*
- Build a rest from smaller parts. Distances inbetween are
- really variable, see Wanske pp. 125 */
-
+ SCM mols = SCM_EOL;
+
+ /*
+ see Wanske pp. 125
+ */
int l = measures;
+ int count = 0;
+ Real symbols_width = 0.0;
+
+ SCM sml = me->get_grob_property ("use-breve-rest");
+
while (l)
{
- int k;
- if (l >= 4)
+ if (sml == SCM_BOOL_T)
{
- l-=4;
- k = -2;
+ int k;
+ if (l >= 2)
+ {
+ l-=2;
+ k = -2;
+ }
+ else
+ {
+ l -= 1;
+ k = -1;
+ }
+
+ Molecule r (musfont->find_by_name ("rests-" + to_string (k)));
+ symbols_width += r.extent (X_AXIS).length ();
+ mols = gh_cons (r.smobbed_copy (), mols);
}
- else if (l>= 2)
+ else
{
- l -= 2;
- k = -1;
- }
- else
- {
- k = 0;
- l --;
+ int k;
+ if (l >= 4)
+ {
+ l-=4;
+ k = -2;
+ }
+ else if (l>= 2)
+ {
+ l -= 2;
+ k = -1;
+ }
+ else
+ {
+ k = 0;
+ l --;
+ }
+
+ Molecule r (musfont->find_by_name ("rests-" + to_string (k)));
+ if (k == 0)
+ {
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
+ r.translate_axis (staff_space, Y_AXIS);
+ }
+ symbols_width += r.extent (X_AXIS).length ();
+ mols = gh_cons (r.smobbed_copy (), mols);
}
+ count ++;
+ }
- Real pad = s.empty_b () ? 0.0 : padding;
+
- Molecule r (musfont->find_by_name ("rests-" + to_str (k)));
- if (k == 0)
- r.translate_axis (staff_space, Y_AXIS);
-
- s.add_at_edge (X_AXIS, RIGHT, r, pad);
+ Real outer_padding_factor = 1.5; // make outer padding this much bigger.
+ Real inner_padding = (space - symbols_width) / (2 * outer_padding_factor + (count-1));
+ if (inner_padding < 0)
+ {
+ inner_padding = 1.0;
}
+
+ Molecule mol;
+ for (SCM s = mols; gh_pair_p (s); s = gh_cdr(s))
+ {
+ mol.add_at_edge (X_AXIS, LEFT, *unsmob_molecule (gh_car (s)), inner_padding);
+ }
+ mol.align_to (X_AXIS, LEFT);
+ mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS);
- s.align_to (X_AXIS, CENTER);
- return s;
+ return mol;
}
-/*
- UGH. JUNKME elt prop "columns" isn't really needed.
- */
void
Multi_measure_rest::add_column (Grob*me,Item* c)
{
SCM
Multi_measure_rest::set_spacing_rods (SCM smob)
{
+ return SCM_UNSPECIFIED;
+
Grob*me = unsmob_grob (smob);
Spanner*sp = dynamic_cast<Spanner*> (me);
return SCM_UNSPECIFIED;
}
- Item * l = sp->get_bound (LEFT)->column_l ();
- Item * r = sp->get_bound (RIGHT)->column_l ();
+ Item * l = sp->get_bound (LEFT)->get_column ();
+ Item * r = sp->get_bound (RIGHT)->get_column ();
Item * lb = l->find_prebroken_piece (RIGHT);
Item * rb = r->find_prebroken_piece (LEFT);
Item* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}};
- Real staff_space = Staff_symbol_referencer::staff_space (me);
+
+ Real sym_width = symbol_molecule (me, 0.0).extent (X_AXIS).length ();
+
for (int i=0; i < 4; i++)
{
Item * l = combinations[i][0];
rod.item_l_drul_[LEFT] = l;
rod.item_l_drul_[RIGHT] = r;
- /*
- should do something more advanced.
- */
- Molecule m = symbol_molecule(me);
- rod.distance_f_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER]
- + m.extent (X_AXIS).length () + 2.5*staff_space;
+ rod.distance_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER]
+ + sym_width + 2.0; // 2.0 = magic!
rod.add_to_cols ();
}
"A rest that spans a whole number of measures. For typesetting the
numbers, fields from font-interface may be used.
-padding is the space between number and rest. Measured in staffspace.
",
- "thickness measure-count expand-limit padding");
+ "expand-limit measure-count number-threshold padding thickness use-breve-rest");