X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcoherent-ligature-engraver.cc;h=e01c6ec1fea1f653bc0ad72f72b3b2a5e8ea7034;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=1bc75b847a8a85663aab3346866c26fe46784fa0;hpb=faaee71fb44c8e1040239797aad336f4e46c2c21;p=lilypond.git diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc index 1bc75b847a..e01c6ec1fe 100644 --- a/lily/coherent-ligature-engraver.cc +++ b/lily/coherent-ligature-engraver.cc @@ -1,17 +1,19 @@ /* coherent-ligature-engraver.cc -- implement Coherent_ligature_engraver - + source file of the GNU LilyPond music typesetter - - (c) 2003 Juergen Reuter - */ + + (c) 2003--2006 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" /* * This abstract class serves as common superclass for all ligature @@ -77,43 +79,37 @@ * 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); +#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 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, inverse_strength); - continue; - } + 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) { - Item *parent = dynamic_cast (item->get_parent (X_AXIS)); + Item *parent = dynamic_cast (item->get_parent (X_AXIS)); if (!parent) { programming_error ("failed tweaking paper column in ligature"); @@ -126,30 +122,29 @@ 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_property ("elements"); - ly_c_pair_p (tail); - tail = ly_cdr (tail)) + + extract_item_set (parent, "elements", elements); + + for (int i = elements.size (); i--;) { - Item *sibling = unsmob_item (ly_car (tail)); - if ((sibling) && - (Staff_symbol_referencer::get_staff_symbol (sibling) == sl)) + 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 = " + "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); } /* @@ -175,29 +170,22 @@ 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 ("Coherent_ligature_engraver::build_ligature (): " - "this is an abstract method that should not be called, " - "but overridden by a subclass"); + 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_from_int (delta_pitch)); + } + prev_pitch = pitch; + prev_primitive = primitive; + } + primitive->set_property ("delta-pitch", scm_from_int (0)); } void @@ -213,10 +201,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