X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-interface.cc;h=3134e04a2a8a1d14303a730dad8469811a29f96f;hb=bc95f4434f760d41191341ab4508b2064eb19025;hp=fcfa28e93cf3d86b6e47daa5826deb16059ab47b;hpb=ac12cc20ac5fd477ddea0db8066f56e4dd8b06ea;p=lilypond.git diff --git a/lily/line-interface.cc b/lily/line-interface.cc index fcfa28e93c..3134e04a2a 100644 --- a/lily/line-interface.cc +++ b/lily/line-interface.cc @@ -1,9 +1,20 @@ /* - line-interface.cc -- implement Line_interface + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2004--2010 Han-Wen Nienhuys - (c) 2004--2007 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 "line-interface.hh" @@ -12,6 +23,7 @@ #include "lookup.hh" #include "output-def.hh" #include "grob.hh" +#include "font-interface.hh" Stencil Line_interface::make_arrow (Offset begin, Offset end, @@ -32,9 +44,43 @@ Line_interface::make_arrow (Offset begin, Offset end, } Stencil -Line_interface::zigzag_stencil (Grob *me, - Offset from, - Offset to) +Line_interface::make_trill_line (Grob *me, + Offset from, + Offset to) +{ + Offset dz = (to-from); + + Font_metric *fm = Font_interface::get_default_font (me); + + Stencil elt = fm->find_by_name ("scripts.trill_element"); + elt.align_to (Y_AXIS, CENTER); + Real elt_len = elt.extent (X_AXIS).length (); + if (elt_len <= 0.0) + { + programming_error ("can't find scripts.trill_element"); + return Stencil (); + } + + Stencil line; + Real len = 0.0; + do + { + line.add_at_edge (X_AXIS, RIGHT, elt, 0); + len = line.extent (X_AXIS).length (); + } + while (len + elt_len < dz.length ()); + + line.rotate (dz.arg (), Offset (LEFT, CENTER)); + line.translate (from); + + return line; +} + + +Stencil +Line_interface::make_zigzag_line (Grob *me, + Offset from, + Offset to) { Offset dz = to -from; @@ -70,13 +116,7 @@ Line_interface::zigzag_stencil (Grob *me, total.add_stencil (moved_squiggle); } - Box b; - b.add_point (Offset (0, 0)); - b.add_point (dz); - b[X_AXIS].widen (thick / 2); - b[Y_AXIS].widen (thick / 2); - - return Stencil (b, total.expr ()); + return total; } @@ -86,7 +126,7 @@ Line_interface::make_dashed_line (Real thick, Offset from, Offset to, { dash_fraction = min (max (dash_fraction, 0.0), 1.0); Real on = dash_fraction * dash_period + thick; - Real off = dash_period - on; + Real off = max (0.0, dash_period - on); SCM at = scm_list_n (ly_symbol2scm ("dashed-line"), scm_from_double (thick), @@ -164,41 +204,58 @@ Line_interface::line (Grob *me, Offset from, Offset to) SCM type = me->get_property ("style"); if (type == ly_symbol2scm ("zigzag")) { - return zigzag_stencil (me, from, to); + return make_zigzag_line (me, from, to); } - Stencil stil; + else if (type == ly_symbol2scm ("trill")) + return make_trill_line (me, from, to); + + Stencil stencil; - SCM dash_fraction = me->get_property ("dash-fraction"); - if (scm_is_number (dash_fraction) || type == ly_symbol2scm ("dotted-line")) + if (type == ly_symbol2scm ("dashed-line") || type == ly_symbol2scm ("dotted-line")) { Real fraction = type == ly_symbol2scm ("dotted-line") ? 0.0 - : robust_scm2double (dash_fraction, 0.4); + : robust_scm2double (me->get_property ("dash-fraction"), 0.4); fraction = min (max (fraction, 0.0), 1.0); Real period = Staff_symbol_referencer::staff_space (me) * robust_scm2double (me->get_property ("dash-period"), 1.0); - if (period < 0) + if (period <= 0) return Stencil (); - stil = make_dashed_line (thick, from, to, period, fraction); + Real len = (to-from).length (); + + int n = (int) rint ((len - period * fraction) / period); + n = max (0, n); + if (n > 0) + { + /* + TODO: figure out something intelligent for really short + sections. + */ + period = ((to-from).length () - period * fraction) / n; + } + stencil = make_dashed_line (thick, from, to, period, fraction); } else - stil = make_line (thick, from, to); + stencil = make_line (thick, from, to); - return stil; + return stencil; } ADD_INTERFACE (Line_interface, - "Generic line objects. Any object using lines supports this. Normally, " - "you get a straight line. If @code{dash-period} is defined, a dashed line is " - "produced; the length of the dashes is tuned with " - "@code{dash-fraction}. If the latter is set to 0, a dotted line is " - "produced. If @code{dash-fraction} is negative, the line is made " - "transparent.", + "Generic line objects. Any object using lines supports this." + " The property @code{style} can be @code{line}," + " @code{dashed-line}, @code{trill}, @code{dotted-line} or" + " @code{zigzag}.\n" + "\n" + "For @code{dashed-line}, the length of the dashes is tuned" + " with @code{dash-fraction}. If the latter is set to@tie{}0, a" + " dotted line is produced. If @code{dash-period} is negative," + " the line is made transparent.", /* properties */ "dash-period "