X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=4ac91fa7f38ac3d650ca984affadd61000d2bf20;hb=48c8ba6ff3dc9e22a3f0f7c94871c3508329010e;hp=862163fad9785987c6414eb58348998e557016a3;hpb=c3ff1c6cd20e15e9036ee7120012e05b1d62a46d;p=lilypond.git

diff --git a/lily/stem.cc b/lily/stem.cc
index 862163fad9..4ac91fa7f3 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -240,22 +240,27 @@ Stem::pure_height (SCM smob, SCM start, SCM end)
   if (!is_normal_stem (me))
     return ly_interval2scm (iv);
 
-  /* if we are part of a cross-staff beam, return empty */
-  if (get_beam (me) && Beam::is_cross_staff (get_beam (me)))
-    return ly_interval2scm (iv);
-  
   Real ss = Staff_symbol_referencer::staff_space (me);
-  Real len = scm_to_double (calc_length (smob)) * ss / 2;
-  Direction dir = get_grob_direction (me);
 
-  Interval hp = head_positions (me);
-  if (dir == UP)
-    iv = Interval (0, len);
-  else
-    iv = Interval (-len, 0);
+  if (!to_boolean (me->get_property ("cross-staff")))
+    {
+      Real len = scm_to_double (calc_length (smob)) * ss / 2;
+      Direction dir = get_grob_direction (me);
 
-  if (!hp.is_empty ())
-    iv.translate (hp[dir] * ss / 2);
+      Interval hp = head_positions (me);
+      if (dir == UP)
+	iv = Interval (0, len);
+      else
+	iv = Interval (-len, 0);
+
+      if (!hp.is_empty ())
+	iv.translate (hp[dir] * ss / 2);
+    }
+
+  /* at a minimum, make the pure-height cover the staff symbol */
+  Real rad = Staff_symbol_referencer::staff_radius (me);
+  iv.add_point (-rad * ss);
+  iv.add_point (rad * ss);
 
   return ly_interval2scm (iv);
 }
@@ -275,8 +280,6 @@ Stem::calc_stem_end_position (SCM smob)
       return me->get_property ("stem-end-position");
     }
   
-  Real ss = Staff_symbol_referencer::staff_space (me);
-  int durlog = duration_log (me);
   vector<Real> a;
 
   /* WARNING: IN HALF SPACES */
@@ -291,41 +294,6 @@ Stem::calc_stem_end_position (SCM smob)
   if (!no_extend_b && dir * stem_end < 0)
     stem_end = 0.0;
 
-  
-  /* Make a little room if we have a upflag and there is a dot.
-     previous approach was to lengthen the stem. This is not
-     good typesetting practice.  */
-  if (!get_beam (me) && dir == UP
-      && durlog > 2)
-    {
-      Grob *closest_to_flag = extremal_heads (me)[dir];
-      Grob *dots = closest_to_flag
-	? Rhythmic_head::get_dots (closest_to_flag) : 0;
-
-      if (dots)
-	{
-	  Real dp = Staff_symbol_referencer::get_position (dots);
-	  Interval flag_yext = flag (me).extent (Y_AXIS) * (2 / ss) + stem_end;
-
-	  /* Very gory: add myself to the X-support of the parent,
-	     which should be a dot-column. */
-	  
-	  if (flag_yext.distance (dp) < 0.5)
-	    {
-	      Grob *par = dots->get_parent (X_AXIS);
-
-	      if (Dot_column::has_interface (par))
-		{
-		  Side_position_interface::add_support (par, me);
-
-		  /* TODO: apply some better logic here. The flag is
-		     curved inwards, so this will typically be too
-		     much. */
-		}
-	    }
-	}
-    }
-
   return scm_from_double (stem_end);
 }
 
@@ -606,6 +574,9 @@ Stem::flag (Grob *me)
       || unsmob_grob (me->get_object ("beam")))
     return Stencil ();
 
+  if (!is_normal_stem (me))
+    return Stencil ();
+  
   /*
     TODO: maybe property stroke-style should take different values,
     e.g. "" (i.e. no stroke), "single" and "double" (currently, it's
@@ -1012,9 +983,9 @@ Stem::is_cross_staff (Grob *stem)
   return beam && Beam::is_cross_staff (beam);
 }
 
-MAKE_SCHEME_CALLBACK (Stem, cross_staff, 1)
+MAKE_SCHEME_CALLBACK (Stem, calc_cross_staff, 1)
 SCM
-Stem::cross_staff (SCM smob)
+Stem::calc_cross_staff (SCM smob)
 {
   return scm_from_bool (is_cross_staff (unsmob_grob (smob)));
 }