X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=2e6eb1b8512d3cbae56320a1b563cf45d2da975f;hb=1aa44fb449c11ff55553621eb1bbb2f33b37dba3;hp=7d8cea10d6d702977057c59bccaf263285098bd3;hpb=e0a7f6822a00738f61043050ba9eb9e089bba982;p=lilypond.git

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 7d8cea10d6..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));
@@ -63,7 +61,7 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir)
 				? ly_symbol2scm ("left-broken")
 				: ly_symbol2scm ("right-broken"), bound_details, SCM_EOL);
 
-      for (SCM s = extra; scm_is_pair (s); s = scm_cdr (s))
+      for (SCM s = scm_reverse (extra); scm_is_pair (s); s = scm_cdr (s))
 	details = scm_cons (scm_car (s), details);
     }
   
@@ -100,7 +98,7 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir)
 	}
       
       details = scm_acons (ly_symbol2scm ("X"),
-			   scm_from_double (bound_grob->extent (commonx, X_AXIS)
+			   scm_from_double (robust_relative_extent (bound_grob, commonx, X_AXIS)
 					    .linear_combination (attach)),
 			   details);
     }
@@ -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);
@@ -254,6 +232,7 @@ Line_spanner::print (SCM smob)
 
   Drul_array<Real> gaps (0, 0);
   Drul_array<bool> arrows (0, 0);
+  Drul_array<Real> anchor_align (0, 0);
   Drul_array<Stencil*> stencils (0,0);
   Drul_array<Grob*> common_y (0, 0);
   do
@@ -262,6 +241,8 @@ Line_spanner::print (SCM smob)
 						 bounds[d], SCM_BOOL_F), 0.0);
       arrows[d] = to_boolean (ly_assoc_get (ly_symbol2scm ("arrow"),
 					    bounds[d], SCM_BOOL_F));
+      anchor_align[d] = robust_scm2double (ly_assoc_get (ly_symbol2scm ("anchor-alignment"),
+								 bounds[d], SCM_BOOL_F), LEFT);
       stencils[d] = unsmob_stencil (ly_assoc_get (ly_symbol2scm ("stencil"),
 						  bounds[d], SCM_BOOL_F));
       common_y[d] = unsmob_grob (ly_assoc_get (ly_symbol2scm ("common-Y"),
@@ -290,22 +271,26 @@ Line_spanner::print (SCM smob)
 
       if (stencils[d])
 	{
-	 Stencil s = stencils[d]->translated (span_points[d]);
-	 SCM align = ly_assoc_get (ly_symbol2scm ("stencil-align-dir-y"),
-				   bounds[d], SCM_BOOL_F);
-	 SCM off = ly_assoc_get (ly_symbol2scm ("stencil-offset"),
-				 bounds[d], SCM_BOOL_F);
+	  Interval ext = stencils[d]->extent (X_AXIS);
+	  Real anchor = ext.linear_combination (anchor_align[d]) - ext[LEFT];
+	  span_points[d][X_AXIS] -= anchor;
 
-	 if (scm_is_number (align)) 
-	   s.align_to (Y_AXIS, scm_to_double (align));
+	  Stencil s = stencils[d]->translated (span_points[d]);
+	  SCM align = ly_assoc_get (ly_symbol2scm ("stencil-align-dir-y"),
+				    bounds[d], SCM_BOOL_F);
+	  SCM off = ly_assoc_get (ly_symbol2scm ("stencil-offset"),
+				  bounds[d], SCM_BOOL_F);
 
-	 /*
-	   todo: should use font-size.
+	  if (scm_is_number (align)) 
+	    s.align_to (Y_AXIS, scm_to_double (align));
+
+	  /*
+	    todo: should use font-size.
 	  */
-	 if (is_number_pair (off))
-	   s.translate (ly_scm2offset (off));
+	  if (is_number_pair (off))
+	    s.translate (ly_scm2offset (off));
 	 
-	 line.add_stencil (s);
+	  line.add_stencil (s);
 	}
     }
   while (flip (&d) != LEFT);
@@ -336,23 +321,22 @@ Line_spanner::print (SCM smob)
   line.translate (Offset (-me->relative_coordinate (commonx, X_AXIS),
 			  -me->relative_coordinate (my_common_y, Y_AXIS)));
 			  
-    
+
   return line.smobbed_copy ();
 }
 
 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 "
 	       );