X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcoherent-ligature-engraver.cc;h=b4d152153b8ff3132c4cd130f9c612b96ae99b6e;hb=a33165e3b6af2d807d069e6eacd0e220ba2ef68a;hp=091403154ec68cf04395189e597533e3f267b854;hpb=011366cd352bf329f9103c099aabd9e54ad92366;p=lilypond.git diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc index 091403154e..b4d152153b 100644 --- a/lily/coherent-ligature-engraver.cc +++ b/lily/coherent-ligature-engraver.cc @@ -3,11 +3,11 @@ source file of the GNU LilyPond music typesetter - (c) 2003 Juergen Reuter + (c) 2003 Juergen Reuter */ #include "coherent-ligature-engraver.hh" -#include "item.hh" + #include "warn.hh" #include "staff-symbol-referencer.hh" #include "spanner.hh" @@ -28,7 +28,7 @@ * * - collect all accidentals that occur within the ligature and put * them at the left side of the ligature (TODO; see function - * collect_accidentals()), + * collect_accidentals ()), * * - collapse superflous space after each ligature (TODO). * @@ -50,9 +50,8 @@ * any further accidental for that pitch within that ligature * (actually, in such a case, the user should split the ligature into * two separate ligatures). Similarly, any object that, in ordinary - * notation, may be put to the left or to the right of a - * note-head/ligature-head, should be collected and put before or - * after the ligature. + * notation, may be put to the left or to the right of a note-head, + * should be collected and put before or after the ligature. * * TODO: make spacing more robust: do not screw up spacing if user * erroneously puts rest in ligature. @@ -61,11 +60,11 @@ * of the ligature (to preemptively avoid collision with adjacent * notes); or maybe just additionally create a * mensural/vaticana/whatever-ligature grob (e.g. via - * Mensural_ligature::brew_molecule(SCM)) that just consists of a + * Mensural_ligature::print (SCM)) that just consists of a * bounding box around all primitives of the ligature. * - * TODO: Maybe move functions fold_up_primitives() and - * join_primitives() from subclasses to here? N.B. it is not + * TODO: Maybe move functions fold_up_primitives () and + * join_primitives () from subclasses to here? N.B. it is not * appropriate to put these into Ligature_engraver, since, for * example, Ligature_bracket_engraver does not share any of this code. */ @@ -74,31 +73,31 @@ * 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 + * 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_grob_property ("forced-spacing"); - if (incr_scm != SCM_EOL) /* (Paper_column::musical_b (l)) */ + 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 + me->warning (_f ("gotcha: ptr =%ul", lc));//debug ly_display_scm (lc->self_scm ()); Real distance; if (incr_scm != SCM_EOL) { - distance = gh_scm2double (incr_scm); + distance = scm_to_double (incr_scm); } else { me->warning ("distance undefined, assuming 0.1"); distance = 0.1; } - me->warning (_f ("distance=%f", distance));//debug + me->warning (_f ("distance =%f", distance));//debug Real strength = 1.0; - Spaceable_grob::add_spring (lc, rc, distance, strength, false); + Spaceable_grob::add_spring (lc, rc, distance, strength); if (Item *rb = r->find_prebroken_piece (LEFT)) - Spaceable_grob::add_spring (lc, rb, distance, strength, false); + Spaceable_grob::add_spring (lc, rb, distance, strength); continue; } @@ -127,11 +126,11 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column) // 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_grob_property ("elements"); - gh_pair_p (tail); - tail = ly_cdr (tail)) + for (SCM tail = parent->get_property ("elements"); + scm_is_pair (tail); + tail = scm_cdr (tail)) { - Item *sibling = unsmob_item (ly_car (tail)); + Item *sibling = unsmob_item (scm_car (tail)); if ((sibling) && (Staff_symbol_referencer::get_staff_symbol (sibling) == sl)) { @@ -139,9 +138,9 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column) 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_grob_property("forced-spacing", - gh_double2scm (0.01)); + "0.01': ptr =%ul", parent)); + sibling_parent->set_property ("forced-spacing", + scm_make_real (0.01)); #endif sibling->set_parent (column, X_AXIS); } @@ -170,10 +169,33 @@ Coherent_ligature_engraver::collect_accidentals (Spanner *, Array) /* TODO */ } +void +compute_delta_pitches (Array 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 ("Cohrent_ligature_engraver::build_ligature (): " + programming_error ("Coherent_ligature_engraver::build_ligature (): " "this is an abstract method that should not be called, " "but overridden by a subclass"); } @@ -182,21 +204,19 @@ void Coherent_ligature_engraver::typeset_ligature (Spanner *ligature, Array primitives) { + // compute some commonly needed context info stored as grob + // properties + compute_delta_pitches (primitives); + // prepare ligature for typesetting build_ligature (ligature, primitives); collect_accidentals (ligature, primitives); - - // now actually typeset - for (int i = 0; i < primitives.size (); i++) - { - typeset_grob (primitives[i].grob_); - } } -ENTER_DESCRIPTION (Coherent_ligature_engraver, +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 abort-event", -/* acks */ "ligature-head-interface note-head-interface rest-interface", +/* accepts */ "ligature-event", +/* acks */ "note-head-interface rest-interface", /* reads */ "", /* write */ "");