-/*
- multi-measure-rest.cc -- implement Multi_measure_rest
-
+/*
+ multi-measure-rest.cc -- implement Multi_measure_rest
+
source file of the GNU LilyPond music typesetter
-
- (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
-
- */
+
+ (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
#include "multi-measure-rest.hh"
-#include "debug.hh"
-#include "paper-def.hh"
+
+#include "warn.hh"
+#include "output-def.hh"
#include "paper-column.hh" // urg
#include "font-interface.hh"
#include "rest.hh"
-#include "molecule.hh"
#include "misc.hh"
#include "spanner.hh"
#include "staff-symbol-referencer.hh"
-#include "text-item.hh"
+#include "system.hh"
+#include "text-interface.hh"
#include "percent-repeat-item.hh"
#include "lookup.hh"
+#include "separation-item.hh"
-bool
-Multi_measure_rest::has_interface (Grob*me)
+Interval
+Multi_measure_rest::bar_width (Spanner *me)
{
- return me->has_interface (ly_symbol2scm ("multi-measure-rest-interface"));
+ Interval iv;
+ Direction d = LEFT;
+ do
+ {
+ Item *col = me->get_bound (d)->get_column ();
+
+ Interval coldim = Paper_column::break_align_width (col);
+
+ iv[d] = coldim[-d];
+ }
+ while ((flip (&d)) != LEFT);
+
+ return iv;
}
-MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1);
+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);
+ Spanner *sp = dynamic_cast<Spanner *> (me);
- // ugh copy & paste.
-
- Interval sp_iv;
- Direction d = LEFT;
- do
- {
- Item * col = sp->get_bound (d)->column_l ();
+ Stencil r = Percent_repeat_item_interface::x_percent (me, 1);
- Interval coldim = col->extent (0, X_AXIS);
+ // ugh copy & paste.
- sp_iv[d] = coldim[-d] ;
- }
- while ((flip (&d)) != LEFT);
+ Grob *common_x = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT),
+ X_AXIS);
+ Interval sp_iv = bar_width (sp);
Real x_off = 0.0;
- Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS);
+ Real rx = sp->get_bound (LEFT)->relative_coordinate (common_x, 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;
+ */
+ x_off += max (sp_iv[LEFT] - rx, 0.0);
/*
center between stuff.
- */
- x_off += sp_iv.length ()/ 2;
+ */
+ x_off += sp_iv.length () / 2;
- r.translate_axis (x_off,X_AXIS);
+ r.translate_axis (x_off, X_AXIS);
-
return r.smobbed_copy ();
}
-
-/*
- [TODO] 17
- variable-sized multi-measure rest symbol: |====| ??
-*/
-MAKE_SCHEME_CALLBACK (Multi_measure_rest,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, print, 1);
SCM
-Multi_measure_rest::brew_molecule (SCM smob)
+Multi_measure_rest::print (SCM smob)
{
Grob *me = unsmob_grob (smob);
- Spanner * sp = dynamic_cast<Spanner*> (me);
+ Spanner *sp = dynamic_cast<Spanner *> (me);
- SCM alist_chain = Font_interface::font_alist_chain (me);
+ Interval sp_iv = bar_width (sp);
+ Real space = sp_iv.length ();
- 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);
- Molecule mol;
- Real x_off = 0.0;
-
- Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS);
+ 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;
+ */
+ Real x_off = max (sp_iv[LEFT] - rx, 0.0);
- mol.add_molecule (symbol_molecule (me));
+ Stencil mol;
+ mol.add_stencil (symbol_stencil (me, space));
int measures = 0;
- SCM m (me->get_grob_property ("measure-count"));
- if (gh_number_p (m))
- {
- measures = gh_scm2int (m);
- }
+ SCM m (me->get_property ("measure-count"));
+ if (scm_is_number (m))
+ measures = scm_to_int (m);
- if (measures > 1)
- {
- 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, Y_AXIS);
- mol.add_molecule (s);
- }
mol.translate_axis (x_off, X_AXIS);
return mol.smobbed_copy ();
}
-
-Molecule
-Multi_measure_rest::symbol_molecule (Grob *me)
+Stencil
+Multi_measure_rest::symbol_stencil (Grob *me, Real space)
{
- SCM alist_chain = Font_interface::font_alist_chain (me);
+ int measures = 0;
+ SCM m (me->get_property ("measure-count"));
+ if (scm_is_number (m))
+ measures = scm_to_int (m);
+ if (measures <= 0)
+ return Stencil ();
+
+ SCM limit = me->get_property ("expand-limit");
+ if (measures > scm_to_int (limit))
+ {
+ Real padding = 0.15;
+ Stencil s = big_rest (me, (1.0 - 2 * padding) * space);
+ s.translate_axis (padding * space, X_AXIS);
+ return s;
+ }
- SCM style_chain =
- Font_interface::add_style (me, ly_symbol2scm ("mmrest-symbol"),
- alist_chain);
+ SCM alist_chain = Font_interface::music_font_alist_chain (me);
Real staff_space = Staff_symbol_referencer::staff_space (me);
Font_metric *musfont
- = Font_interface::get_font (me,style_chain);
- Molecule s;
+ = select_font (me->layout (), alist_chain);
- int measures = 0;
- SCM m (me->get_grob_property ("measure-count"));
- if (gh_number_p (m))
- {
- measures = gh_scm2int (m);
- }
-
-
- SCM limit = me->get_grob_property ("expand-limit");
- if (measures <= 0)
- return s;
+ SCM sml = me->get_property ("use-breve-rest");
if (measures == 1)
{
- s = musfont->find_by_name (Rest::glyph_name (me, 0, ""));
+ if (to_boolean (sml))
+ {
+ Stencil s = musfont->find_by_name (Rest::glyph_name (me, -1, "", false));
- /*
- 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);
- }
- else
- {
- Real w = gh_scm2double (me->get_grob_property ("width"));
- s = big_rest (me, w);
+ s.translate_axis ((space - s.extent (X_AXIS).length ()) / 2, X_AXIS);
+
+ return s;
+ }
+ else
+ {
+ Stencil s = musfont->find_by_name (Rest::glyph_name (me, 0, "", true));
+
+ /*
+ 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;
+ }
}
- return s;
+ else
+ return church_rest (me, musfont, measures, space);
}
-Molecule
+/*
+ WIDTH can also be 0 to determine the minimum size of the object.
+*/
+Stencil
Multi_measure_rest::big_rest (Grob *me, Real width)
{
- Real thick = gh_scm2double (me->get_grob_property ("thickness"));
+ Real thick_thick = robust_scm2double (me->get_property ("thick-thickness"), 1.0);
+ Real hair_thick = robust_scm2double (me->get_property ("hair-thickness"), .1);
+
Real ss = Staff_symbol_referencer::staff_space (me);
-
- Real slt = me->paper_l ()->get_var ("stafflinethickness");
- Real y = slt * thick/2 * ss;
- Box b(Interval (0, width), Interval (-y, y));
- Real ythick = slt * ss;
-
- Molecule m = Lookup::filledbox (b);
- Molecule yb = Lookup::filledbox (Box (Interval (-ythick, ythick), Interval (-ss, ss)));
+ Real slt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
+ Real y = slt * thick_thick / 2 * ss;
+ Real ythick = hair_thick * slt * ss;
+ Box b (Interval (0.0, max (0.0, (width - 2 * ythick))), Interval (-y, y));
- m.add_at_edge (X_AXIS, RIGHT, yb, -ythick);
- m.add_at_edge (X_AXIS, LEFT, yb, -ythick);
+ Real blot = width ? (.8 * min (y, ythick)) : 0.0;
+
+ Stencil m = Lookup::round_filled_box (b, blot);
+ Stencil yb = Lookup::round_filled_box (Box (Interval (-0.5, 0.5) * ythick, Interval (-ss, ss)), blot);
+
+ m.add_at_edge (X_AXIS, RIGHT, yb, 0);
+ m.add_at_edge (X_AXIS, LEFT, yb, 0);
+
+ m.align_to (X_AXIS, LEFT);
- m.align_to (X_AXIS, CENTER);
-
return m;
}
/*
Kirchenpause (?)
-
- */
-Molecule
-Multi_measure_rest::church_rest (Font_metric *musfont, int measures,
- Real staff_space, Real padding)
+*/
+Stencil
+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;
+
+ bool use_breve = to_boolean (me->get_property ("use-breve-rest"));
+
while (l)
{
- int k;
- if (l >= 4)
+ if (use_breve)
{
- l-=4;
- k = -2;
- }
- else if (l>= 2)
- {
- l -= 2;
- k = -1;
+ int k;
+ if (l >= 2)
+ {
+ l -= 2;
+ k = -2;
+ }
+ else
+ {
+ l -= 1;
+ k = -1;
+ }
+
+ Stencil r (musfont->find_by_name ("rests." + to_string (k)));
+ symbols_width += r.extent (X_AXIS).length ();
+ mols = scm_cons (r.smobbed_copy (), mols);
}
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--;
+ }
+
+ Stencil 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 = scm_cons (r.smobbed_copy (), mols);
}
-
- 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);
+ count++;
}
- s.align_to (X_AXIS, CENTER);
- return s;
+ /* Make outer padding this much bigger. */
+ Real outer_padding_factor = 1.5;
+ Real inner_padding = (space - symbols_width)
+ / (2 * outer_padding_factor + (count - 1));
+ if (inner_padding < 0)
+ inner_padding = 1.0;
+
+ Stencil mol;
+ for (SCM s = mols; scm_is_pair (s); s = scm_cdr (s))
+ mol.add_at_edge (X_AXIS, LEFT, *unsmob_stencil (scm_car (s)),
+ inner_padding);
+ mol.align_to (X_AXIS, LEFT);
+ mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS);
+
+ return mol;
}
-/*
- UGH. JUNKME elt prop "columns" isn't really needed.
- */
void
-Multi_measure_rest::add_column (Grob*me,Item* c)
+Multi_measure_rest::add_column (Grob *me, Item *c)
{
- add_bound_item (dynamic_cast<Spanner*> (me),c);
+ add_bound_item (dynamic_cast<Spanner *> (me), c);
}
-
-MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods,1);
-
-SCM
-Multi_measure_rest::set_spacing_rods (SCM smob)
+void
+Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
{
- Grob*me = unsmob_grob (smob);
-
- Spanner*sp = dynamic_cast<Spanner*> (me);
+ Spanner *sp = dynamic_cast<Spanner *> (me);
if (! (sp->get_bound (LEFT) && sp->get_bound (RIGHT)))
{
programming_error ("Multi_measure_rest::get_rods (): I am not spanned!");
- return SCM_UNSPECIFIED;
+ return ;
}
- Item * l = sp->get_bound (LEFT)->column_l ();
- Item * r = sp->get_bound (RIGHT)->column_l ();
- 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);
- for (int i=0; i < 4; i++)
+ Item *li = sp->get_bound (LEFT)->get_column ();
+ Item *ri = sp->get_bound (RIGHT)->get_column ();
+ Item *lb = li->find_prebroken_piece (RIGHT);
+ Item *rb = ri->find_prebroken_piece (LEFT);
+
+ Item *combinations[4][2] = {{li, ri},
+ {lb, ri},
+ {li, rb},
+ {lb, rb}};
+
+ for (int i = 0; i < 4; i++)
{
- Item * l = combinations[i][0];
- Item *r = combinations[i][1];
+ Item *li = combinations[i][0];
+ Item *ri = combinations[i][1];
- if (!l || !r)
+ if (!li || !ri)
continue;
Rod rod;
- 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.item_drul_[LEFT] = li;
+ rod.item_drul_[RIGHT] = ri;
+
+ rod.distance_ = Paper_column::minimum_distance (li, ri)
+ + length
+ + 2 * robust_scm2double (me->get_property ("bound-padding"), 1.0);
+
+ Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0);
+ rod.distance_ = max (rod.distance_, minlen);
rod.add_to_cols ();
}
- return SCM_UNSPECIFIED;
}
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods, 1);
+SCM
+Multi_measure_rest::set_spacing_rods (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+ Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length ();
+ calculate_spacing_rods (me, sym_width);
+
+ return SCM_UNSPECIFIED;
+}
+
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_text_rods, 1);
+SCM
+Multi_measure_rest::set_text_rods (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+ Stencil *stil = me->get_stencil ();
+
+ /* FIXME uncached */
+ Real len = (stil && !stil->extent (X_AXIS).is_empty ())
+ ? stil->extent (X_AXIS).length ()
+ : 0.0;
+ calculate_spacing_rods (me, len);
+ return SCM_UNSPECIFIED;
+}
-ADD_INTERFACE (Multi_measure_rest,"multi-measure-rest-interface",
- "A rest that spans a whole number of measures. For typesetting the
-numbers, fields from font-interface may be used.
+ADD_INTERFACE (Multi_measure_rest,
+ "A rest that spans a whole number of measures.",
-padding is the space between number and rest. Measured in staffspace.
+ /* properties */
+ "expand-limit "
+ "measure-count "
+ "hair-thickness "
+ "thick-thickness "
+ "use-breve-rest "
+ "bound-padding "
+ "minimum-length "
+ );
-",
- "thickness measure-count expand-limit padding");