X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=2e6eb1b8512d3cbae56320a1b563cf45d2da975f;hb=598ae0a0f49e834d5af8825f7eef8044fc95a5ec;hp=bb9b2327445fb279e22cef4f234350055261fff5;hpb=a6a4b3fc2009f17a1a48cca0c11bfd3f38645937;p=lilypond.git diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index bb9b232744..2e6eb1b851 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2008 Jan Nieuwenhuizen + (c) 2000--2009 Jan Nieuwenhuizen */ #include "align-interface.hh" @@ -13,7 +13,6 @@ #include "item.hh" #include "lily-proto.hh" #include "line-interface.hh" -#include "moment.hh" #include "output-def.hh" #include "pointer-group-interface.hh" #include "spanner.hh" @@ -26,7 +25,6 @@ class Line_spanner { public: DECLARE_SCHEME_CALLBACK (print, (SCM)); - DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM)); DECLARE_SCHEME_CALLBACK (calc_left_bound_info, (SCM)); DECLARE_SCHEME_CALLBACK (calc_left_bound_info_and_text, (SCM)); DECLARE_SCHEME_CALLBACK (calc_right_bound_info, (SCM)); @@ -212,28 +210,8 @@ Line_spanner::print (SCM smob) { Spanner *me = dynamic_cast (unsmob_grob (smob)); - Interval_t moments = me->spanned_time (); - /* - We remove the line at the start of the line. For piano voice - indicators, it makes no sense to have them at the start of the - line. - - I'm not sure what the official rules for glissandi are, but - usually the 2nd note of the glissando is "exact", so when playing - from the start of the line, there is no need to glide. - - From a typographical p.o.v. this makes sense, since the amount of - space left of a note at the start of a line is very small. - - --hwn. - - */ - if (moments.length () == Moment (0,0)) - return SCM_EOL; - Drul_array bounds (me->get_property ("left-bound-info"), me->get_property ("right-bound-info")); - Grob *commonx = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS); commonx = me->common_refpoint (commonx, X_AXIS); @@ -349,11 +327,7 @@ Line_spanner::print (SCM smob) ADD_INTERFACE (Line_spanner, "Generic line drawn between two objects, e.g., for use with" - " glissandi.\n" - "\n" - "The property @code{style} can be @code{line}," - " @code{dashed-line}, @code{trill}, @code{dotted-line} or" - " @code{zigzag}.", + " glissandi.", /* properties */ "bound-details "