X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcoherent-ligature-engraver.cc;h=3250304c2d2a29fab0ee909240a5e1df95e707c9;hb=b0c79ceb092e54f20a2d745144db266b2fa3c828;hp=e9ce487e2a0690f8f0e69a86c3c2d9a49827314b;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc index e9ce487e2a..3250304c2d 100644 --- a/lily/coherent-ligature-engraver.cc +++ b/lily/coherent-ligature-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2003--2010 Juergen Reuter + Copyright (C) 2003--2011 Juergen Reuter LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -83,7 +83,6 @@ * example, Ligature_bracket_engraver does not share any of this code. */ - /* * TODO: move this function to class Item? */ @@ -98,21 +97,21 @@ Coherent_ligature_engraver::move_related_items_to_column { Item *sibling = elements[i]; if (!sibling) - // should not occur, but who knows... -jr - continue; + // should not occur, but who knows... -jr + continue; if (Staff_symbol_referencer::get_staff_symbol (sibling) != staff_symbol) - // sibling is from a staff different than that of the item of - // interest - continue; + // 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)); + "setting `spacing-increment=" + "0.01': ptr=%ul", parent)); sibling_parent->set_property ("forced-spacing", - scm_from_double (0.01)); + scm_from_double (0.01)); #endif sibling->set_parent (target_column, X_AXIS); @@ -148,13 +147,13 @@ compute_delta_pitches (vector primitives) primitive = dynamic_cast (primitives[i].grob ()); Stream_event *cause = primitives[i].event_cause (); int pitch - = unsmob_pitch (cause->get_property ("pitch"))->steps (); + = 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)); - } + { + delta_pitch = pitch - prev_pitch; + prev_primitive->set_property ("delta-position", + scm_from_int (delta_pitch)); + } prev_pitch = pitch; prev_primitive = primitive; } @@ -163,7 +162,7 @@ compute_delta_pitches (vector primitives) void Coherent_ligature_engraver::typeset_ligature (Spanner *ligature, - vector primitives) + vector primitives) { // compute some commonly needed context info stored as grob // properties