X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcoherent-ligature-engraver.cc;h=df89149f2daba60e9cca3a1b6f4eb738fbd65f79;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=2ef5cf41bd316da7abc5f19197150b686e1e0bb6;hpb=1e1fa5221ca359326b073626168c6b7cda6453e1;p=lilypond.git diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc index 2ef5cf41bd..df89149f2d 100644 --- a/lily/coherent-ligature-engraver.cc +++ b/lily/coherent-ligature-engraver.cc @@ -1,17 +1,20 @@ /* coherent-ligature-engraver.cc -- implement Coherent_ligature_engraver - + source file of the GNU LilyPond music typesetter - - (c) 2003 Juergen Reuter - */ + + (c) 2003--2008 Juergen Reuter +*/ #include "coherent-ligature-engraver.hh" -#include "item.hh" + #include "warn.hh" -#include "staff-symbol-referencer.hh" -#include "spanner.hh" #include "paper-column.hh" +#include "pitch.hh" +#include "pointer-group-interface.hh" +#include "spanner.hh" +#include "staff-symbol-referencer.hh" +#include "stream-event.hh" /* * This abstract class serves as common superclass for all ligature @@ -33,7 +36,7 @@ * - collapse superflous space after each ligature (TODO). * * Concrete subclasses must implement function build_ligature (Spanner - * *, Array). This function is responsible for actually + * *, vector). This function is responsible for actually * building the ligature by transforming the array of noteheads. * * Currently, there are two subclasses: Gregorian_ligature_engraver @@ -69,86 +72,40 @@ * example, Ligature_bracket_engraver does not share any of this code. */ -/* - * TODO: Let superflous space after each ligature collapse. The - * following code should help in doing so (though it does not yet - * fully work). Just put the following code into - * Spacing_spanner::do_measure (). I put it temporarily here as memo - * 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 - SCM incr_scm = lc->get_property ("forced-spacing"); - if (incr_scm != SCM_EOL) /* (Paper_column::is_musical (l)) */ - { - me->warning (_f ("gotcha: ptr=%ul", lc));//debug - ly_display_scm (lc->self_scm ()); - Real distance; - if (incr_scm != SCM_EOL) - { - distance = scm_to_double (incr_scm); - } - else - { - 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); - if (Item *rb = r->find_prebroken_piece (LEFT)) - Spaceable_grob::add_spring (lc, rb, distance, strength); - - continue; - } -#endif - -Coherent_ligature_engraver::Coherent_ligature_engraver () -{ -} /* * TODO: move this function to class Item? */ void -Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column) +Coherent_ligature_engraver::move_related_items_to_column +(Item *item, Paper_column *target_column, Real offset) { - Item *parent = dynamic_cast (item->get_parent (X_AXIS)); - if (!parent) + Paper_column *source_column = item->get_column (); + Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (item); + extract_item_set (source_column, "elements", elements); + for (vsize i = elements.size (); i--;) { - programming_error ("failed tweaking paper column in ligature"); - return; - } + Item *sibling = elements[i]; + if (!sibling) + // should not occur, but who knows... -jr + continue; - String name = parent->name (); - if (!String::compare (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)) - { - Item *sibling = unsmob_item (scm_car (tail)); - if ((sibling) && - (Staff_symbol_referencer::get_staff_symbol (sibling) == sl)) - { -#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)); + if (Staff_symbol_referencer::get_staff_symbol (sibling) != staff_symbol) + // sibling is from a staff different than that of the item of + // interest + continue; + +#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_from_double (0.01)); #endif - sibling->set_parent (column, X_AXIS); - } - } - } - else - { - get_set_column (parent, column); + + sibling->set_parent (target_column, X_AXIS); + sibling->translate_axis (offset, X_AXIS); } } @@ -164,45 +121,38 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column) * occurs within the broken ligatures any more. */ void -Coherent_ligature_engraver::collect_accidentals (Spanner *, Array) +Coherent_ligature_engraver::collect_accidentals (Spanner *, vector) { /* TODO */ } void -compute_delta_pitches (Array primitives) +compute_delta_pitches (vector primitives) { int prev_pitch = 0; int delta_pitch = 0; Item *prev_primitive = 0, *primitive = 0; - for (int i = 0; i < primitives.size (); i++) { - primitive = dynamic_cast (primitives[i].grob_); - Music *music_cause = primitives[i].music_cause (); - int pitch = - unsmob_pitch (music_cause->get_property ("pitch"))->steps (); - if (prev_primitive) - { - delta_pitch = pitch - prev_pitch; - prev_primitive->set_property ("delta-pitch", - scm_int2num (delta_pitch)); - } - prev_pitch = pitch; - prev_primitive = primitive; - } - primitive->set_property ("delta-pitch", scm_int2num (0)); -} - -void -Coherent_ligature_engraver::build_ligature (Spanner *, Array) -{ - programming_error ("Coherent_ligature_engraver::build_ligature (): " - "this is an abstract method that should not be called, " - "but overridden by a subclass"); + for (vsize i = 0; i < primitives.size (); i++) + { + primitive = dynamic_cast (primitives[i].grob ()); + Stream_event *cause = primitives[i].event_cause (); + int pitch + = unsmob_pitch (cause->get_property ("pitch"))->steps (); + if (prev_primitive) + { + delta_pitch = pitch - prev_pitch; + prev_primitive->set_property ("delta-position", + scm_from_int (delta_pitch)); + } + prev_pitch = pitch; + prev_primitive = primitive; + } + primitive->set_property ("delta-position", scm_from_int (0)); } void Coherent_ligature_engraver::typeset_ligature (Spanner *ligature, - Array primitives) + vector primitives) { // compute some commonly needed context info stored as grob // properties @@ -213,10 +163,5 @@ Coherent_ligature_engraver::typeset_ligature (Spanner *ligature, collect_accidentals (ligature, primitives); } -ENTER_DESCRIPTION (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