source file of the GNU LilyPond music typesetter
- (c) 2003--2005 Juergen Reuter <reuter@ipd.uka.de>
+ (c) 2003--2006 Juergen Reuter <reuter@ipd.uka.de>
*/
#include "coherent-ligature-engraver.hh"
#include "staff-symbol-referencer.hh"
#include "spanner.hh"
#include "paper-column.hh"
+#include "pitch.hh"
+#include "pointer-group-interface.hh"
/*
* This abstract class serves as common superclass for all ligature
* - collapse superflous space after each ligature (TODO).
*
* Concrete subclasses must implement function build_ligature (Spanner
- * *, Array<Grob_info>). This function is responsible for actually
+ * *, vector<Grob_info>). This function is responsible for actually
* building the ligature by transforming the array of noteheads.
*
* Currently, there are two subclasses: Gregorian_ligature_engraver
* until it really works and I also get Han-Wen's/Jan's permission to
* add it to the spacing spanner code.
*/
-#if 0 // experimental code to collapse spacing after ligature
+#if 0 /* experimental code to collapse spacing after ligature */
SCM incr_scm = lc->get_property ("forced-spacing");
if (incr_scm != SCM_EOL) /* (Paper_column::is_musical (l)) */
{
ly_display_scm (lc->self_scm ());
Real distance;
if (incr_scm != SCM_EOL)
- {
- distance = scm_to_double (incr_scm);
- }
+ distance = scm_to_double (incr_scm);
else
{
- me->warning ("distance undefined, assuming 0.1");
+ me->warning (_ ("distance undefined, assuming 0.1"));
distance = 0.1;
}
me->warning (_f ("distance=%f", distance));//debug
- Real strength = 1.0;
- Spaceable_grob::add_spring (lc, rc, distance, strength);
+ Real inverse_strength = 1.0;
+ Spaceable_grob::add_spring (lc, rc, distance, inverse_strength);
if (Item *rb = r->find_prebroken_piece (LEFT))
- Spaceable_grob::add_spring (lc, rb, distance, strength);
+ Spaceable_grob::add_spring (lc, rb, distance, inverse_strength);
continue;
}
#endif
-Coherent_ligature_engraver::Coherent_ligature_engraver ()
-{
-}
-
/*
* TODO: move this function to class Item?
*/
return;
}
- String name = parent->name ();
- if (!String::compare (name, "PaperColumn"))
+ string name = parent->name ();
+ if (name != "PaperColumn")
{
// Change column not only for targeted item (NoteColumn), but
// also for all associated grobs (NoteSpacing, SeparationItem).
Grob *sl = Staff_symbol_referencer::get_staff_symbol (item);
- for (SCM tail = parent->get_property ("elements");
- scm_is_pair (tail);
- tail = scm_cdr (tail))
+
+ extract_item_set (parent, "elements", elements);
+
+ for (vsize i = elements.size (); i--;)
{
- Item *sibling = unsmob_item (scm_car (tail));
+ Item *sibling = elements[i];
if ((sibling)
&& (Staff_symbol_referencer::get_staff_symbol (sibling) == sl))
{
-#if 0 // experimental code to collapse spacing after ligature
+#if 0 /* experimental code to collapse spacing after ligature */
Grob *sibling_parent = sibling->get_parent (X_AXIS);
sibling_parent->warning (_f ("Coherent_ligature_engraver: "
"setting `spacing-increment="
"0.01': ptr=%ul", parent));
sibling_parent->set_property ("forced-spacing",
- scm_make_real (0.01));
+ scm_from_double (0.01));
#endif
sibling->set_parent (column, X_AXIS);
}
}
}
else
- {
- get_set_column (parent, column);
- }
+ get_set_column (parent, column);
}
/*
* occurs within the broken ligatures any more.
*/
void
-Coherent_ligature_engraver::collect_accidentals (Spanner *, Array<Grob_info>)
+Coherent_ligature_engraver::collect_accidentals (Spanner *, vector<Grob_info>)
{
/* TODO */
}
void
-compute_delta_pitches (Array<Grob_info> primitives)
+compute_delta_pitches (vector<Grob_info> primitives)
{
int prev_pitch = 0;
int delta_pitch = 0;
Item *prev_primitive = 0, *primitive = 0;
- for (int i = 0; i < primitives.size (); i++)
+ for (vsize i = 0; i < primitives.size (); i++)
{
- primitive = dynamic_cast<Item *> (primitives[i].grob_);
+ primitive = dynamic_cast<Item *> (primitives[i].grob ());
Music *music_cause = primitives[i].music_cause ();
int pitch
= unsmob_pitch (music_cause->get_property ("pitch"))->steps ();
{
delta_pitch = pitch - prev_pitch;
prev_primitive->set_property ("delta-pitch",
- scm_int2num (delta_pitch));
+ scm_from_int (delta_pitch));
}
prev_pitch = pitch;
prev_primitive = primitive;
}
- primitive->set_property ("delta-pitch", scm_int2num (0));
-}
-
-void
-Coherent_ligature_engraver::build_ligature (Spanner *, Array<Grob_info>)
-{
- programming_error ("Coherent_ligature_engraver::build_ligature (): "
- "this is an abstract method that should not be called, "
- "but overridden by a subclass");
+ primitive->set_property ("delta-pitch", scm_from_int (0));
}
void
Coherent_ligature_engraver::typeset_ligature (Spanner *ligature,
- Array<Grob_info> primitives)
+ vector<Grob_info> primitives)
{
// compute some commonly needed context info stored as grob
// properties
collect_accidentals (ligature, primitives);
}
-ADD_TRANSLATOR (Coherent_ligature_engraver,
- /* descr */ "This is an abstract class. Subclasses such as Gregorian_ligature_engraver handle ligatures by glueing special ligature heads together.",
- /* creats*/ "",
- /* accepts */ "ligature-event",
- /* acks */ "note-head-interface rest-interface",
- /* reads */ "",
- /* write */ "");
+// no ADD_ACKNOWLEDGER / ADD_ACKNOWLEDGER / ADD_TRANSLATOR macro calls
+// since this class is abstract
projects / lilypond.git / blobdiff