source file of the GNU LilyPond music typesetter
- (c) 1998--1999, 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "multi-measure-rest.hh"
#include "debug.hh"
#include "paper-def.hh"
-#include "p-col.hh" // urg
-#include "bar.hh"
-#include "lookup.hh"
+#include "paper-column.hh" // urg
+#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"
-
-Multi_measure_rest::Multi_measure_rest ()
+void
+Multi_measure_rest::set_interface (Score_element*me)
{
- measures_i_ = 0;
+ me->set_interface (ly_symbol2scm ("multi-measure-rest-interface"));
}
-void
-Multi_measure_rest::do_print () const
+bool
+Multi_measure_rest::has_interface (Score_element*me)
{
-#ifndef NPRINT
- DOUT << "measures_i_ " << measures_i_;
-#endif
+ return me->has_interface (ly_symbol2scm ("multi-measure-rest-interface"));
}
-
-
-/*
- [TODO] 17
+ /*
+ [TODO] 17
* variable-sized multi-measure rest symbol: |====| ??
-
- * build 3, 5, 6, 7, 8 symbols (how far, property?)
- from whole, brevis and longa rests
-
*/
-Molecule*
-Multi_measure_rest::do_brew_molecule_p () const
+MAKE_SCHEME_CALLBACK(Multi_measure_rest,brew_molecule,1);
+SCM
+Multi_measure_rest::brew_molecule (SCM smob)
{
+ Score_element *me = unsmob_element (smob);
+ Spanner * sp = dynamic_cast<Spanner*> (me);
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
+
Interval sp_iv;
Direction d = LEFT;
do
{
- Item * col = spanned_drul_[d]->column_l ();
+ Item * col = sp->get_bound (d)->column_l ();
- Interval coldim = col->extent (X_AXIS);
+ Interval coldim = col->extent (0, X_AXIS);
sp_iv[d] = coldim[-d] ;
}
while ((flip (&d)) != LEFT);
- Molecule *mol_p = new Molecule;
+ Molecule mol;
Real x_off = 0.0;
-
- Dimension_cache * col_ref = spanned_drul_[LEFT]->column_l ()->dim_cache_[X_AXIS];
-
- Real rx = spanned_drul_[LEFT]->absolute_coordinate (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.
Molecule s;
- if (measures_i_ == 1 || measures_i_ == 2 || measures_i_ == 4)
- {
- s = lookup_l ()->rest (- intlog2(measures_i_), 0, "");
- s.translate_axis (-s.extent ()[X_AXIS].length () / 2, X_AXIS);
- }
- else
+
+ int measures = 1;
+ SCM m (me->get_elt_property ("measure-count"));
+ if (gh_number_p (m))
{
- s = lookup_l ()->rest (-4, 0, "");
+ measures = gh_scm2int (m);
}
- mol_p->add_molecule (s);
- Real interline_f = staff_line_leading_f ();
- if (measures_i_ == 1)
+
+
+ SCM limit = me->get_elt_property ("expand-limit");
+ if (measures <= gh_scm2int (limit))
{
- mol_p->translate_axis (interline_f, Y_AXIS);
+ /*
+ Build a rest from smaller parts. Distances inbetween are
+ really variable, see Wanske pp. 125 */
+
+ int l = measures;
+ while (l)
+ {
+ int k;
+ if (l >= 4)
+ {
+ l-=4;
+ k = -2;
+ }
+ else if (l>= 2)
+ {
+ l -= 2;
+ k = -1;
+ }
+ else
+ {
+ k = 0;
+ l --;
+ }
+
+ Real pad = s.empty_b ()
+ ? 0.0 : gh_scm2double (me->get_elt_property ("padding")) * staff_space;
+
+ Molecule r (Font_interface::get_default_font (me)->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);
+ }
+
+
+ s.align_to (X_AXIS, CENTER);
}
- else if (measures_i_ > 1)
+ else
{
- Molecule s ( lookup_l ()->text ("number", to_str (measures_i_)));
-
- s.translate_axis (3.0 * interline_f, Y_AXIS);
- mol_p->add_molecule (s);
+ String idx = ("rests-") + to_str (-4);
+ s = Font_interface::get_default_font (me)->find_by_name (idx);
}
+
+ mol.add_molecule (s);
- mol_p->translate_axis (x_off, X_AXIS);
- return mol_p;
-}
-
-void
-Multi_measure_rest::do_add_processing ()
-{
- if (column_arr_.size ())
+ if (measures > 1)
{
- set_bounds (LEFT, column_arr_[0 >? column_arr_.size () - 2]);
- set_bounds (RIGHT, column_arr_[column_arr_.size () - 1]);
+ SCM properties = Font_interface::font_alist_chain (me);
+ Molecule s = Text_item::text2molecule (me,
+ ly_str02scm (to_str (measures).ch_C ()),
+ properties);
+ 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();
}
-
-void
-Multi_measure_rest::do_post_processing ()
-{
- if (!column_arr_.size ())
- set_elt_property (transparent_scm_sym, SCM_BOOL_T);
-}
-
+/*
+ UGH. JUNKME elt prop "columns" isn't really needed.
+ */
void
-Multi_measure_rest::do_substitute_element_pointer (Score_element* o, Score_element* n)
-{
- Staff_symbol_referencer::do_substitute_element_pointer (o,n);
- if (Item* c = dynamic_cast <Item*> (o))
- column_arr_.substitute (c, dynamic_cast<Item*> (n));
-}
-
-void
-Multi_measure_rest::add_column (Item* c)
+Multi_measure_rest::add_column (Score_element*me,Item* c)
{
- column_arr_.push (c);
- add_dependency (c);
+ Pointer_group_interface::add_element (me, "columns",c);
+
+ add_bound_item (dynamic_cast<Spanner*> (me),c);
}
-Array<Rod>
-Multi_measure_rest::get_rods () const
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods,1);
+
+SCM
+Multi_measure_rest::set_spacing_rods (SCM smob)
{
- Array<Rod> a;
+ Score_element*me = unsmob_element (smob);
- if (!(spanned_drul_[LEFT] && spanned_drul_[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 SCM_UNSPECIFIED;
}
- Rod r;
- r.item_l_drul_ = spanned_drul_;
- r.distance_f_ = paper_l ()->get_var ("mmrest_x_minimum");
- a.push (r);
+ 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);
- /*
- also set distances in case the left or right ending of the rest is
- a broken column. This is very common: it happens if the rest is in
- the beginning of the line, or at the end.
-
- TODO: merge this code with other discretionary handling code.
-
- TODO: calc mmrest_x_minimum (see brew_molecule_p ())
- */
-
- Drul_array<Item*> discretionaries;
- Direction d = LEFT;
- do
- {
- Item *i = r.item_l_drul_[d]->find_prebroken_piece (-d);
- discretionaries[d] = i;
- if (i)
- {
- Rod k (r);
-
- k.item_l_drul_[d] = i;
- a.push (k);
- }
- }
- while ((flip (&d))!= LEFT);
-
- if (discretionaries[LEFT] && discretionaries[RIGHT])
+ 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++)
{
- Rod k(r);
- k.item_l_drul_ = discretionaries;
- a.push (k);
- }
+ Item * l = combinations[i][0];
+ Item *r = combinations[i][1];
+ if (!l || !r)
+ continue;
+ Rod rod;
+ rod.item_l_drul_[LEFT] = l;
+ rod.item_l_drul_[RIGHT] = r;
- return a;
+ /*
+ should do something more advanced.
+ */
+ rod.distance_f_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER]
+ + gh_scm2double (me->get_elt_property ("minimum-width")) * staff_space;
+
+ rod.add_to_cols ();
+ }
+ return SCM_UNSPECIFIED;
}
+
projects / lilypond.git / blobdiff