X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=8069a456c814e48cf24bddec96bf9d8fae2279ac;hb=5824899210e6d05e3b8767ffff25c79dca6b038e;hp=c07a2164a5d691bf73ff70a5bbb0725001c78565;hpb=8c197373e3dfce4382469a541b38be1f13a48e13;p=lilypond.git

diff --git a/lily/stem.cc b/lily/stem.cc
index c07a2164a5..8069a456c8 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   TODO: This is way too hairy
@@ -127,10 +127,13 @@ Stem::set_stem_positions (Grob *me, Real se)
   if (d && d * head_positions (me)[get_grob_direction (me)] >= se * d)
     me->warning (_ ("weird stem size, check for narrow beams"));
 
-  Interval height = me->pure_height (me, 0, INT_MAX);
+  // trigger note collision mechanisms
+  Real stem_beg = internal_calc_stem_begin_position (me, false);
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Real half_space = staff_space * 0.5;
 
+  Interval height;
+  height[-d] = stem_beg * half_space;
   height[d] = se * half_space + beam_end_corrective (me);
 
   Real stemlet_length = robust_scm2double (me->get_property ("stemlet-length"),
@@ -222,8 +225,7 @@ Stem::extremal_heads (Grob *me)
       Grob *n = heads[i];
       int p = Staff_symbol_referencer::get_rounded_position (n);
 
-      Direction d = LEFT;
-      do
+      for (LEFT_and_RIGHT (d))
         {
           if (d * p > d * extpos[d])
             {
@@ -231,23 +233,27 @@ Stem::extremal_heads (Grob *me)
               extpos[d] = p;
             }
         }
-      while (flip (&d) != DOWN);
     }
   return exthead;
 }
 
-/* The positions, in ascending order.  */
+/* The staff positions, in ascending order.
+ * If FILTER, include the main column of noteheads only */
 vector<int>
-Stem::note_head_positions (Grob *me)
+Stem::note_head_positions (Grob *me, bool filter)
 {
   vector<int> ps;
   extract_grob_set (me, "note-heads", heads);
+  Grob *xref = common_refpoint_of_array (heads, me, X_AXIS);
 
   for (vsize i = heads.size (); i--;)
     {
       Grob *n = heads[i];
-      int p = Staff_symbol_referencer::get_rounded_position (n);
+      if (filter
+          && n->relative_coordinate (xref, X_AXIS) != 0.0)
+        continue;
 
+      int p = Staff_symbol_referencer::get_rounded_position (n);
       ps.push_back (p);
     }
 
@@ -277,7 +283,12 @@ Stem::is_invisible (Grob *me)
 bool
 Stem::is_normal_stem (Grob *me)
 {
-  return head_count (me) && scm_to_int (me->get_property ("duration-log")) >= 1;
+  if (!head_count (me))
+    return false;
+
+  extract_grob_set (me, "note-heads", heads);
+  SCM style = heads[0]->get_property ("style");
+  return style != ly_symbol2scm ("kievan") && scm_to_int (me->get_property ("duration-log")) >= 1;
 }
 
 MAKE_SCHEME_CALLBACK (Stem, pure_height, 3)
@@ -306,10 +317,8 @@ Stem::internal_pure_height (Grob *me, bool calc_beam)
     {
       Interval overshoot;
       Direction dir = get_grob_direction (me);
-      Direction d = DOWN;
-      do
+      for (DOWN_and_UP (d))
         overshoot[d] = d == dir ? dir * infinity_f : iv[d];
-      while (flip (&d) != DOWN);
 
       vector<Interval> heights;
       vector<Grob *> my_stems;
@@ -357,10 +366,8 @@ Stem::cache_pure_height (Grob *me, Interval iv, Interval my_iv)
 {
   Interval overshoot;
   Direction dir = get_grob_direction (me);
-  Direction d = DOWN;
-  do
+  for (DOWN_and_UP (d))
     overshoot[d] = d == dir ? dir * infinity_f : my_iv[d];
-  while (flip (&d) != DOWN);
 
   iv.intersect (overshoot);
   dynamic_cast<Item *> (me)->cache_pure_height (iv);
@@ -682,7 +689,7 @@ Interval
 Stem::internal_height (Grob *me, bool calc_beam)
 {
   Grob *beam = get_beam (me);
-  if (!is_valid_stem (me) && ! beam)
+  if (!is_valid_stem (me) && !beam)
     return Interval ();
 
   Direction dir = get_grob_direction (me);
@@ -693,6 +700,13 @@ Stem::internal_height (Grob *me, bool calc_beam)
       (void) beam->get_property ("quantized-positions");
     }
 
+  /*
+    If there is a beam but no stem, slope calculations depend on this
+    routine to return where the stem end /would/ be.
+  */
+  if (calc_beam && !beam && !unsmob_stencil (me->get_property ("stencil")))
+    return Interval ();
+
   Real y1 = robust_scm2double ((calc_beam
                                 ? me->get_property ("stem-begin-position")
                                 : me->get_pure_property ("stem-begin-position", 0, INT_MAX)),
@@ -1128,6 +1142,7 @@ ADD_INTERFACE (Stem,
                "stemlet-length "
                "thickness "
                "tremolo-flag "
+               "tuplet-start "
               );
 
 /****************************************************************/