source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include "atom.hh"
+
#include "box.hh"
#include "debug.hh"
#include "lookup.hh"
#include "molecule.hh"
#include "note-column.hh"
-#include "p-col.hh" // urg
+#include "paper-column.hh"
#include "bar.hh"
-#include "p-col.hh"
#include "paper-def.hh"
#include "volta-spanner.hh"
#include "stem.hh"
-#include "text-def.hh"
-
-/*
- Hmm, should probably make generic Bracket_spanner,
- or and derive Plet and volta spanner from that.
- */
+#include "dimension-cache.hh"
+#include "group-interface.hh"
+#include "side-position-interface.hh"
+#include "directional-element-interface.hh"
Volta_spanner::Volta_spanner ()
{
- dir_ = UP;
- last_b_ = false;
- number_p_.set_p (new Text_def);
- number_p_->align_dir_ = LEFT;
- dot_p_.set_p (new Text_def);
- dot_p_->align_dir_ = LEFT;
+ set_elt_property ("bars", SCM_EOL);
+ Side_position_interface (this).set_axis (Y_AXIS);
+ directional_element (this).set (UP);
}
-Molecule*
-Volta_spanner::brew_molecule_p () const
+
+/*
+ this is too complicated. Yet another version of side-positioning,
+ badly implemented.
+
+ --
+
+ * Should look for system_start_delim to find left edge of staff.
+
+
+*/
+Molecule
+Volta_spanner::do_brew_molecule () const
{
- Molecule* mol_p = new Molecule;
+ Molecule mol;
- if (column_arr_.size ())
- {
- Real internote_f = paper ()->internote_f ();
- Real dx = internote_f;
- Real w = width ().length () - 2 * dx;
- Atom volta (lookup_l ()->volta (w, last_b_));
- Real h = volta.dim_.y ().length ();
- Atom num (number_p_->get_atom (paper (), LEFT));
- Atom dot (dot_p_->get_atom (paper (), LEFT));
- Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_] >
- column_arr_[0]->extent (Y_AXIS) [dir_];
- dy += 2 * h;
- for (int i = 0; i < note_column_arr_.size (); i++)
- dy = dy >? note_column_arr_[i]->height ().max ();
- dy -= h;
-
- Real gap = num.dim_.x ().length () / 2;
- Offset off (num.dim_.x ().length () + gap,
- (h - num.dim_.y ().length ()) / internote_f - gap);
- num.translate (off);
- Real dotheight = dot.dim_.y ().length () / 7;
- off -= Offset (0, dotheight);
- dot.translate (off);
- mol_p->add_atom (volta);
- mol_p->add_atom (num);
- mol_p->add_atom (dot);
- mol_p->translate (Offset (dx, dy));
- }
- return mol_p;
+ Link_array<Bar> bar_arr
+ = Group_interface__extract_elements (this, (Bar*)0, "bars");
+
+ if (!bar_arr.size ())
+ return mol;
+
+ bool no_vertical_start = false;
+ bool no_vertical_end = to_boolean (get_elt_property ("last-volta"));
+ Spanner *orig_span = dynamic_cast<Spanner*> (original_l_);
+ if (orig_span && (orig_span->broken_into_l_arr_[0] != (Spanner*)this))
+ no_vertical_start = true;
+ if (orig_span && (orig_span->broken_into_l_arr_.top () != (Spanner*)this))
+ no_vertical_end = true;
+
+#if 0
+ // FIXME
+ if (bar_arr.top ()->get_elt_property (type_str_.length_i () > 1)
+ no_vertical_end = false;
+#endif
+
+ Real staff_space = paper_l ()->get_var ("interline");
+ Real half_space = staff_space / 2;
+
+ Real w = spanner_length ()
+ - get_broken_left_end_align ()
+ - half_space;
+ Real h = paper_l()->get_var ("volta_spanner_height");
+ Real t = paper_l ()->get_var ("volta_thick");
+
+ SCM at = (gh_list (ly_symbol2scm ("volta"),
+ gh_double2scm (h),
+ gh_double2scm (w),
+ gh_double2scm (t),
+ gh_int2scm (no_vertical_start),
+ gh_int2scm (no_vertical_end),
+ SCM_UNDEFINED));
+
+ Box b (Interval (0, w), Interval (0, h));
+ Molecule volta (b, at);
+ mol.add_molecule (volta);
+
+ Molecule num (lookup_l ()->text ("volta",
+ ly_scm2string (get_elt_property("text")),
+ paper_l ()));
+
+ mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
+ - staff_space);
+ return mol;
}
void
Volta_spanner::do_add_processing ()
{
- if (column_arr_.size ())
+
+ Link_array<Bar> bar_arr
+ = Group_interface__extract_elements (this, (Bar*)0, "bars");
+
+ if (bar_arr.size ())
{
- set_bounds (LEFT, column_arr_[0]);
- set_bounds (RIGHT, column_arr_.top ());
+ set_bound (LEFT, bar_arr[0]);
+ set_bound (RIGHT, bar_arr.top ());
}
- number_p_->style_str_ = "number-1";
- dot_p_->text_str_ = ".";
- dot_p_->style_str_ = "bold";
-}
-
-void
-Volta_spanner::do_post_processing ()
-{
- if (column_arr_.size())
- translate_axis (column_arr_[0]->extent (Y_AXIS)[dir_], Y_AXIS);
}
void
-Volta_spanner::do_substitute_dependency (Score_element* o, Score_element* n)
+Volta_spanner::after_line_breaking ()
{
- if (Note_column* c = dynamic_cast <Note_column*> (o))
- note_column_arr_.substitute (c, dynamic_cast<Note_column*> (n));
- else if (Bar* c = dynamic_cast <Bar*> (o))
- column_arr_.substitute (c, dynamic_cast<Bar*> (n));
+ Side_position_interface (this).add_staff_support ();
}
void
-Volta_spanner::add_column (Bar* c)
+Volta_spanner::add_bar (Bar* b)
{
- column_arr_.push (c);
- add_dependency (c);
+ Group_interface gi(this, "bars");
+ gi.add_element (b);
+
+ Side_position_interface (this).add_support (b);
+ add_dependency (b);
}
void
Volta_spanner::add_column (Note_column* c)
{
- note_column_arr_.push (c);
+ Side_position_interface (this).add_support (c);
add_dependency (c);
}
-
projects / lilypond.git / blobdiff