X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-interface.cc;h=9e11cfa73a3545b3329c62f03ed22a7aa48585dc;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=072bdbb39d0ee021acf8db6f52e6a242451c89a0;hpb=6fb6249345ce846c8c55f843b21c6e85024a720b;p=lilypond.git diff --git a/lily/spacing-interface.cc b/lily/spacing-interface.cc index 072bdbb39d..9e11cfa73a 100644 --- a/lily/spacing-interface.cc +++ b/lily/spacing-interface.cc @@ -1,10 +1,20 @@ /* - spacing-interface.cc -- functionality that is shared between Note_spacing - and Staff_spacing + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2007--2014 Joe Neeman - (c) 2007 Joe Neeman + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "spacing-interface.hh" @@ -17,6 +27,7 @@ #include "paper-column.hh" #include "separation-item.hh" #include "skyline.hh" +#include "skyline-pair.hh" #include "system.hh" /* return the right-pointing skyline of the left-items and the left-pointing @@ -33,51 +44,49 @@ Spacing_interface::skylines (Grob *me, Grob *right_col) */ Grob *orig = me->original () ? me->original () : me; - Drul_array break_dirs (dynamic_cast (me)->break_status_dir (), - dynamic_cast (right_col)->break_status_dir ()); + Drul_array break_dirs (dynamic_cast (me)->break_status_dir (), + dynamic_cast (right_col)->break_status_dir ()); Drul_array skylines = Drul_array (Skyline (RIGHT), Skyline (LEFT)); - Drul_array > items (ly_scm2link_array (orig->get_object ("left-items")), - ly_scm2link_array (orig->get_object ("right-items"))); + Drul_array > items (ly_scm2link_array (orig->get_object ("left-items")), + ly_scm2link_array (orig->get_object ("right-items"))); Grob *system = me->get_system (); - Grob *left_col = dynamic_cast (me)->get_column (); + Grob *left_col = dynamic_cast (me)->get_column (); - Drul_array columns (left_col, right_col); + Drul_array columns (left_col, right_col); - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { for (vsize i = 0; i < items[d].size (); i++) - { - Item *g = dynamic_cast (items[d][i]); - if (g) - if (Item *piece = g->find_prebroken_piece (break_dirs[d])) - g = piece; - - if (g && Separation_item::has_interface (g) && g->get_column () == columns[d]) - { - SCM sky_scm = g->get_property ("horizontal-skylines"); - Skyline_pair *sky = Skyline_pair::unsmob (sky_scm); - - extract_grob_set (g, "elements", elts); - Grob *ycommon = common_refpoint_of_array (elts, g, Y_AXIS); - Real shift = ycommon->pure_relative_y_coordinate (system, 0, INT_MAX); - - skylines[d].shift (-shift); - - if (sky) - skylines[d].merge ((*sky)[-d]); - else - programming_error ("separation item has no skyline"); - - if (d == RIGHT && items[LEFT].size ()) - skylines[d].merge (Separation_item::conditional_skyline (items[d][i], items[LEFT][0])); - - skylines[d].shift (shift); - } - } + { + Item *g = dynamic_cast (items[d][i]); + if (g) + if (Item *piece = g->find_prebroken_piece (break_dirs[d])) + g = piece; + + if (g && Separation_item::has_interface (g) && g->get_column () == columns[d]) + { + SCM sky_scm = g->get_property ("horizontal-skylines"); + Skyline_pair *sky = Skyline_pair::unsmob (sky_scm); + + extract_grob_set (g, "elements", elts); + Grob *ycommon = common_refpoint_of_array (elts, g, Y_AXIS); + Real shift = ycommon->pure_relative_y_coordinate (system, 0, INT_MAX); + + skylines[d].shift (-shift); + + if (sky) + skylines[d].merge ((*sky)[-d]); + else + programming_error ("separation item has no skyline"); + + if (d == RIGHT && items[LEFT].size ()) + skylines[d].merge (Separation_item::conditional_skyline (items[d][i], items[LEFT][0])); + + skylines[d].shift (shift); + } + } } - while (flip (&d) != LEFT); return skylines; } @@ -91,20 +100,7 @@ Spacing_interface::minimum_distance (Grob *me, Grob *right) } /* - Compute the column of the right-items. This is a big function, - since RIGHT-ITEMS may span more columns (eg. if a clef is inserted, - this will add a new column to RIGHT-ITEMS. Here we look at the - columns, and return the left-most. If there are multiple columns, we - prune RIGHT-ITEMS. - - If we end up pruning, we add a left-neighbor to every column that - gets pruned. This ensures that loose columns in cross-staff music - do indeed get marked as loose. The problem situation is when a voice - passes from staff 1 to staff 2 and a clef appears later on in staff 1. - Then the NoteSpacing attached to the last note in staff 1 has two - right-items: one pointing to the next note in staff 2 and one pointing - to the clef. We will prune the clef right-item here and, unless we add - a left-neighbor to the clef, it won't get marked as loose. + Compute the left-most column of the right-items. */ Item * Spacing_interface::right_column (Grob *me) @@ -115,7 +111,6 @@ Spacing_interface::right_column (Grob *me) Grob_array *a = unsmob_grob_array (me->get_object ("right-items")); Item *mincol = 0; int min_rank = INT_MAX; - bool prune = false; for (vsize i = 0; a && i < a->size (); i++) { Item *ri = a->item (i); @@ -124,33 +119,10 @@ Spacing_interface::right_column (Grob *me) int rank = Paper_column::get_rank (col); if (rank < min_rank) - { - min_rank = rank; - if (mincol) - prune = true; - - mincol = col; - } - else if (rank > min_rank) - prune = true; - } - - if (prune && a) - { - vector &right = a->array_reference (); - for (vsize i = right.size (); i--;) - { - if (dynamic_cast (right[i])->get_column () != mincol) - { - extract_grob_set (right[i], "left-neighbors", lns); - if (lns.empty ()) - Pointer_group_interface::add_grob (right[i], - ly_symbol2scm ("left-neighbors"), - dynamic_cast (me)->get_column ()); - - right.erase (right.begin () + i); - } - } + { + min_rank = rank; + mincol = col; + } } return mincol; @@ -165,35 +137,35 @@ Spacing_interface::left_column (Grob *me) return dynamic_cast (me)->get_column (); } -static vector -get_note_columns (vector const &elts) +static vector +get_note_columns (vector const &elts) { - vector ret; + vector ret; for (vsize i = 0; i < elts.size (); i++) { if (Note_column::has_interface (elts[i])) - ret.push_back (dynamic_cast (elts[i])); + ret.push_back (dynamic_cast (elts[i])); else if (Separation_item::has_interface (elts[i])) - { - extract_grob_set (elts[i], "elements", more_elts); - vector ncs = get_note_columns (more_elts); + { + extract_grob_set (elts[i], "elements", more_elts); + vector ncs = get_note_columns (more_elts); - ret.insert (ret.end (), ncs.begin (), ncs.end ()); - } + ret.insert (ret.end (), ncs.begin (), ncs.end ()); + } } return ret; } -vector +vector Spacing_interface::right_note_columns (Grob *me) { extract_grob_set (me, "right-items", elts); return get_note_columns (elts); } -vector +vector Spacing_interface::left_note_columns (Grob *me) { extract_grob_set (me, "left-items", elts); @@ -206,9 +178,9 @@ Spacing_interface::left_note_columns (Grob *me) */ Grob * Spacing_interface::extremal_break_aligned_grob (Grob *me, - Direction d, - Direction break_dir, - Interval *last_ext) + Direction d, + Direction break_dir, + Interval *last_ext) { Grob *col = 0; last_ext->set_empty (); @@ -218,39 +190,38 @@ Spacing_interface::extremal_break_aligned_grob (Grob *me, for (vsize i = elts.size (); i--;) { - Item *break_item = dynamic_cast (elts[i]); + Item *break_item = dynamic_cast (elts[i]); if (break_item->break_status_dir () != break_dir) - break_item = break_item->find_prebroken_piece (break_dir); + break_item = break_item->find_prebroken_piece (break_dir); if (!break_item || !scm_is_pair (break_item->get_property ("space-alist"))) - continue; + continue; if (!col) - col = dynamic_cast (elts[0])->get_column ()->find_prebroken_piece (break_dir); + col = dynamic_cast (elts[0])->get_column ()->find_prebroken_piece (break_dir); Interval ext = break_item->extent (col, X_AXIS); if (ext.is_empty ()) - continue; + continue; if (!last_grob - || (last_grob && d * (ext[-d]- (*last_ext)[-d]) < 0)) - { - *last_ext = ext; - last_grob = break_item; - } + || (last_grob && d * (ext[-d] - (*last_ext)[-d]) < 0)) + { + *last_ext = ext; + last_grob = break_item; + } } return last_grob; } - ADD_INTERFACE (Spacing_interface, - "This object calculates the desired and minimum distances " - "between two columns.", + "This object calculates the desired and minimum distances" + " between two columns.", - /* properties */ - "left-items " - "right-items " - ); + /* properties */ + "left-items " + "right-items " + );