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 "paper-column.hh" // urg
#include "bar.hh"
#include "lookup.hh"
#include "rest.hh"
-#include "script.hh"
-
#include "molecule.hh"
#include "misc.hh"
-
+#include "group-interface.hh"
+#include "stem.hh"
+#include "staff-symbol-referencer.hh"
Multi_measure_rest::Multi_measure_rest ()
{
- measures_i_ = 0;
+ set_elt_property ("columns", SCM_EOL);
}
-void
-Multi_measure_rest::do_print () const
-{
- DOUT << "measures_i_ " << measures_i_;
-}
-Molecule*
-Multi_measure_rest::do_brew_molecule_p () const
+/*
+ [TODO] 17
+ * variable-sized multi-measure rest symbol: |====| ??
+*/
+Molecule
+Multi_measure_rest::do_brew_molecule () const
{
+ Real staff_space
+ = staff_symbol_referencer (this).staff_space ();
+
+ Interval sp_iv;
+ Direction d = LEFT;
+ do
+ {
+ Item * col = get_bound (d)->column_l ();
+
+ Interval coldim = col->extent (X_AXIS)
+ + col->relative_coordinate (0, X_AXIS);
+
+ sp_iv[d] = coldim[-d] ;
+ }
+ while ((flip (&d)) != LEFT);
+ Molecule mol;
+ Real x_off = 0.0;
+
+ Real rx = get_bound (LEFT)->relative_coordinate (0, X_AXIS);
/*
- [TODO] 17
- * variable-sized multi-measure rest symbol: |====| ??
- * build 3, 5, 6, 7, 8 symbols (how far, property?)
- from whole, brevis and longa rests
+ we gotta stay clear of sp_iv, so move a bit to the right if
+ needed.
*/
- Molecule* mol_p = new Molecule;
- if (!column_arr_.size ())
- return mol_p;
+ x_off += (sp_iv[LEFT] - rx) >? 0;
+ /*
+ center between stuff.
+ */
+ x_off += sp_iv.length ()/ 2;
+
+
Molecule s;
- if (measures_i_ == 1 || measures_i_ == 2 || measures_i_ == 4)
+
+ int measures = 1;
+ SCM m (get_elt_property ("measure-count"));
+ if (gh_number_p (m))
{
- s = (lookup_l ()->rest (- intlog2(measures_i_), 0, ""));
- s.translate_axis (-s.extent ()[X_AXIS].length () / 2, X_AXIS);
+ measures = gh_scm2int (m);
}
- else
+
+
+ if (measures <= paper_l() ->get_var ("multi_measure_rest_expand_limit"))
{
- s = (lookup_l ()->rest (-4, 0, ""));
+ /*
+ 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 : paper_l ()->get_var ("multi_measure_rest_padding");
+
+ Molecule r (lookup_l ()->afm_find ("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);
}
- mol_p->add_molecule (s);
- Real interline_f = staff_line_leading_f ();
- if (measures_i_ == 1)
+ else
{
- mol_p->translate_axis (interline_f, Y_AXIS);
+ String idx = ("rests-") + to_str (-4);
+ s = lookup_l ()->afm_find (idx);
}
+
+ mol.add_molecule (s);
- if (measures_i_ > 1)
+ if (measures > 1)
{
- Molecule s ( lookup_l ()->text ("number", to_str (measures_i_)));
-
- s.translate_axis (3.0 * interline_f, Y_AXIS);
- mol_p->add_molecule (s);
+ 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);
}
-
- return mol_p;
+ mol.translate_axis (x_off, X_AXIS);
+ return mol;
}
+/*
+ UGH. JUNKME elt prop "columns" isn't really needed.
+ */
+
void
Multi_measure_rest::do_add_processing ()
{
- if (column_arr_.size ())
+ if (gh_pair_p (get_elt_property ("columns")))
{
- set_bounds (LEFT, column_arr_[0 >? column_arr_.size () - 2]);
- set_bounds (RIGHT, column_arr_[column_arr_.size () - 1]);
+ Link_array<Item> column_arr (Group_interface__extract_elements (this, (Item*)0, "columns"));
+
+ set_bound (LEFT, column_arr[0 >? column_arr.size () - 2]);
+ set_bound (RIGHT, column_arr.top ());
}
+
+ // set columns to SCM_EOL?
}
void
Multi_measure_rest::do_post_processing ()
{
- if (column_arr_.size ())
- translate_axis (extent (X_AXIS).length () / 2, X_AXIS);
+ if (!gh_pair_p (get_elt_property ("columns")))
+ set_elt_property ("transparent", SCM_BOOL_T);
}
-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)
{
- column_arr_.push (c);
+ Group_interface gi (this, "columns");
+ gi.add_element (c);
+
+
add_dependency (c);
}
Multi_measure_rest::get_rods () const
{
Array<Rod> a;
- Rod r;
- r.item_l_drul_ = spanned_drul_;
- r.distance_f_ = paper_l ()->get_var ("mmrest_x_minimum");
- a.push (r);
+
+ if (!(get_bound (LEFT) && get_bound (RIGHT)))
+ {
+ programming_error ("Multi_measure_rest::get_rods (): I am not spanned!");
+ return a;
+ }
+
+ Item * l = get_bound (LEFT)->column_l ();
+ Item * r = get_bound (RIGHT)->column_l ();
+ Item * lb = l->find_broken_piece (RIGHT);
+ Item * rb = r->find_broken_piece (LEFT);
+
+ Item* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}};
+ for (int i=0; i < 4; i++)
+ {
+ 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;
+
+ /*
+ 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);
+ }
+
return a;
}
+
projects / lilypond.git / blobdiff