-/*
- 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--2000 Jan Nieuwenhuizen <janneke@gnu.org>
-
- */
+
+ (c) 1998--2006 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 "bar.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
#include "rest.hh"
-#include "molecule.hh"
#include "misc.hh"
-#include "group-interface.hh"
-#include "stem.hh"
+#include "spanner.hh"
#include "staff-symbol-referencer.hh"
+#include "text-interface.hh"
+#include "percent-repeat-item.hh"
+#include "lookup.hh"
+#include "separation-item.hh"
-Multi_measure_rest::Multi_measure_rest (SCM s)
- : Spanner (s)
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, percent, 1);
+SCM
+Multi_measure_rest::percent (SCM smob)
{
- set_elt_pointer ("columns", SCM_EOL);
-}
+ Grob *me = unsmob_grob (smob);
+ Spanner *sp = dynamic_cast<Spanner *> (me);
+ Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6);
-/*
- [TODO] 17
- * variable-sized multi-measure rest symbol: |====| ??
-*/
+ // ugh copy & paste.
+
+ Interval sp_iv;
+ Direction d = LEFT;
+ do
+ {
+ Item *col = sp->get_bound (d)->get_column ();
+
+ 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 += max (sp_iv[LEFT] - rx, 0.0);
+
+ /*
+ center between stuff.
+ */
+ x_off += sp_iv.length () / 2;
-GLUE_SCORE_ELEMENT(Multi_measure_rest,brew_molecule);
+ r.translate_axis (x_off, X_AXIS);
+ return r.smobbed_copy ();
+}
+
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, print, 1);
SCM
-Multi_measure_rest::member_brew_molecule () const
+Multi_measure_rest::print (SCM smob)
{
- Real staff_space
- = Staff_symbol_referencer_interface (this).staff_space ();
+ Grob *me = unsmob_grob (smob);
+ Spanner *sp = dynamic_cast<Spanner *> (me);
Interval sp_iv;
Direction d = LEFT;
+
+ Grob *common = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
do
{
- Item * col = get_bound (d)->column_l ();
+ Item *b = sp->get_bound (d);
- Interval coldim = col->extent (X_AXIS)
- + col->relative_coordinate (0, X_AXIS);
+ Interval coldim = (Separation_item::has_interface (b))
+ ? Separation_item::relative_width (b, common)
+ : b->extent (common, X_AXIS);
- sp_iv[d] = coldim[-d] ;
+ sp_iv[d] = coldim.is_empty () ? b->relative_coordinate (common, X_AXIS) : coldim[-d];
}
while ((flip (&d)) != LEFT);
- Molecule mol;
- Real x_off = 0.0;
- Real rx = get_bound (LEFT)->relative_coordinate (0, X_AXIS);
+ 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 = max (sp_iv[LEFT] - rx, 0.0);
- /*
- center between stuff.
- */
- x_off += sp_iv.length ()/ 2;
+ Stencil mol;
+ mol.add_stencil (symbol_stencil (me, space));
-
- Molecule s;
+ int measures = 0;
+ SCM m (me->get_property ("measure-count"));
+ if (scm_is_number (m))
+ measures = scm_to_int (m);
- int measures = 1;
- SCM m (get_elt_property ("measure-count"));
- if (gh_number_p (m))
+ mol.translate_axis (x_off, X_AXIS);
+ return mol.smobbed_copy ();
+}
+
+Stencil
+Multi_measure_rest::symbol_stencil (Grob *me, Real space)
+{
+ 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))
{
- measures = gh_scm2int (m);
+ Real padding = 0.15;
+ Stencil s = big_rest (me, (1.0 - 2 * padding) * space);
+ s.translate_axis (padding * space, X_AXIS);
+ return s;
}
-
- if (measures <= paper_l() ->get_var ("multi_measure_rest_expand_limit"))
+ SCM alist_chain = Font_interface::music_font_alist_chain (me);
+
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
+ Font_metric *musfont
+ = select_font (me->layout (), alist_chain);
+
+ SCM sml = me->get_property ("use-breve-rest");
+ if (measures == 1)
{
- /*
- Build a rest from smaller parts. Distances inbetween are
- really variable, see Wanske pp. 125 */
+ if (to_boolean (sml))
+ {
+ Stencil s = musfont->find_by_name (Rest::glyph_name (me, -1, "", false));
- int l = measures;
- while (l)
+ 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;
+ }
+ }
+ else
+ return church_rest (me, musfont, measures, space);
+}
+
+/*
+ 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_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->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));
+
+ 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, 0);
+ m.add_at_edge (X_AXIS, LEFT, yb, 0, 0);
+
+ m.align_to (X_AXIS, LEFT);
+
+ return m;
+}
+
+/*
+ Kirchenpause (?)
+*/
+Stencil
+Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures,
+ Real space)
+{
+ SCM mols = SCM_EOL;
+
+ /* See Wanske pp. 125 */
+ int l = measures;
+ int count = 0;
+ Real symbols_width = 0.0;
+
+ SCM sml = me->get_property ("use-breve-rest");
+
+ while (l)
+ {
+ if (sml == SCM_BOOL_T)
+ {
+ 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
{
int k;
if (l >= 4)
{
- l-=4;
+ l -= 4;
k = -2;
}
- else if (l>= 2)
+ else if (l >= 2)
{
l -= 2;
k = -1;
else
{
k = 0;
- l --;
+ l--;
}
- Real pad = s.empty_b ()
- ? 0.0 : paper_l ()->get_var ("multi_measure_rest_padding");
-
- Molecule r (lookup_l ()->afm_find ("rests-" + to_str (k)));
+ Stencil r (musfont->find_by_name ("rests." + to_string (k)));
if (k == 0)
- r.translate_axis (staff_space, Y_AXIS);
-
- s.add_at_edge (X_AXIS, RIGHT, r, pad);
+ {
+ 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);
}
-
-
- s.align_to (X_AXIS, CENTER);
- }
- else
- {
- String idx = ("rests-") + to_str (-4);
- s = lookup_l ()->afm_find (idx);
+ count++;
}
-
- mol.add_molecule (s);
- if (measures > 1)
- {
- Molecule s (lookup_l ()->text ("number", to_str (measures), paper_l ()));
- 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();
+ /* 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, 0);
+ 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 (Item* c)
+Multi_measure_rest::add_column (Grob *me, Item *c)
{
- Pointer_group_interface gi (this, "columns");
- gi.add_element (c);
-
- add_bound_item (this, c);
-
- add_dependency (c);
+ add_bound_item (dynamic_cast<Spanner *> (me), c);
}
-
-Array<Rod>
-Multi_measure_rest::get_rods () const
+void
+Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
{
- Array<Rod> a;
-
- if (!(get_bound (LEFT) && get_bound (RIGHT)))
+ 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 a;
+ return ;
}
- Item * l = get_bound (LEFT)->column_l ();
- Item * r = 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}};
- 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.
- */
- rod.distance_f_ = l->extent (X_AXIS)[BIGGER] - r->extent (X_AXIS)[SMALLER]
- + paper_l ()->get_var ("multi_measure_rest_x_minimum");
-
- a.push (rod);
+ rod.item_drul_[LEFT] = li;
+ rod.item_drul_[RIGHT] = ri;
+
+ rod.distance_ = li->extent (li, X_AXIS)[BIGGER]
+ - ri->extent (ri, X_AXIS)[SMALLER]
+ + 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 ();
}
+}
+
+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;
+}
- return a;
+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.",
+
+ /* properties */
+ "expand-limit "
+ "measure-count "
+ "hair-thickness "
+ "thick-thickness "
+ "use-breve-rest "
+ "bound-padding "
+ "minimum-length");
+
projects / lilypond.git / blobdiff