X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=2e6eb1b8512d3cbae56320a1b563cf45d2da975f;hb=4908afe216a92f70fd6f8c8cd0db8a6aa0a10ec1;hp=7c629297387815c90809610f2144e52517943e9e;hpb=b0984ac0eae12ef21adcdbc4922354e731e8f22d;p=lilypond.git

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 7c62929738..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--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #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<Spanner *> (unsmob_grob (smob));
 
-  Interval_t<Moment> 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<SCM> 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);
@@ -348,18 +326,17 @@ Line_spanner::print (SCM smob)
 }
 
 ADD_INTERFACE (Line_spanner,
-	       "Generic line drawn between two objects, e.g. for use with glissandi.\n"
-	       "The property @code{style} can be @code{line}, "
-	       "@code{dashed-line}, @code{trill}, \n"
-	       "@code{dotted-line} or @code{zigzag}.\n"
-	       "\n",
+	       "Generic line drawn between two objects, e.g., for use with"
+	       " glissandi.",
 
-	       "bound-details " 
+	       /* properties */
+	       "bound-details "
 	       "extra-dy "
 	       "gap "
 	       "left-bound-info "
 	       "note-columns "
-	       "right-bound-info " 
+	       "right-bound-info "
 	       "thickness "
+	       "to-barline "
 	       );