X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=e36980a92f3bc8d30dafea88c529c931ddece722;hb=3b9c317edf4fe68d90f8958ded77d2bc1e76f768;hp=91c5f657c3bae6e542a59f5a4fa7cc6dc3c4c155;hpb=7f3f0083f89d87c5ed0422858e9648fc759e98a4;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 91c5f657c3..e36980a92f 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -1,9 +1,20 @@ /* - dot-column.cc -- implement Dot_column + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2010 Han-Wen Nienhuys - (c) 1997--2008 Han-Wen Nienhuys + 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 "dot-column.hh" @@ -99,12 +110,17 @@ Dot_column::calc_positioning_done (SCM smob) y.add_point (y1); y.add_point (y2); } + else if (Note_head::has_interface (s)) + y = Interval (-1, 1); else - y = s->extent (s, Y_AXIS); + { + programming_error ("unknown grob in dot col support"); + continue; + } y *= 2 / ss; y += Staff_symbol_referencer::get_position (s); - + Box b (s->extent (commonx, X_AXIS), y); boxes.push_back (b); @@ -122,7 +138,7 @@ Dot_column::calc_positioning_done (SCM smob) Interval y = flag.extent (Y_AXIS) * (2 / ss) + Stem::stem_end_position (stem); - + Interval x = stem->relative_coordinate (commonx, X_AXIS) + flag.extent (X_AXIS);