Fix 537 (introduced in c0e7005ed202874f8ea67279e5c96ec53985c3fb)

[lilypond.git] / lily / beam.cc

diff --git a/lily/beam.cc b/lily/beam.cc
index 79bc076f212165339bb73497aa04d78dbc967d52..bc861aca146134c461adeebe1cd51709398b9f72 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -167,9 +167,15 @@ Beam::calc_direction (SCM smob)
          Grob *stem = first_normal_stem (me);
 
          /*
-           ugh: stems[0] case happens for chord tremolo.
+           This happens for chord tremolos.
          */
-         dir = to_dir ((stem ? stem : stems[0])->get_property ("default-direction"));
+         if (!stem)
+           stem = stems[0];
+         
+         if (is_direction (stem->get_property_data ("direction"))) 
+           dir = to_dir (stem->get_property_data ("direction"));
+         else
+           dir = to_dir (stem->get_property ("default-direction"));
        }
     }
 
@@ -336,7 +342,6 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common)
   Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   Slice ranks;
-  
   for (vsize i = 0; i < stems.size (); i++)
     {
       Grob *stem = stems[i];
@@ -366,7 +371,7 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common)
              Beam_stem_segment seg;
              seg.stem_ = stem;
              seg.stem_x_ = stem_x;
-             seg.rank_ = 2 * i  + (d+1)/2;
+             seg.rank_ = 2 * i + (d+1)/2;
              seg.width_ = stem_width;
              seg.stem_index_ = i;
              seg.dir_ = d;
@@ -404,14 +409,15 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common)
          Direction event_dir = LEFT;
          do
            {
-             bool on_bound = (event_dir == LEFT) ? j == 0 :
+             bool on_line_bound = (segs[j].dir_ == LEFT) ? segs[j].stem_index_ == 0
+               : segs[j].stem_index_ == stems.size() - 1;
+             bool on_beam_bound = (event_dir == LEFT) ? j == 0 :
                j == segs.size () - 1;
-
              bool inside_stem = (event_dir == LEFT)
-                       ? segs[j].stem_index_ > 0
-                       : segs[j].stem_index_ + 1  < stems.size () ;
+               ? segs[j].stem_index_ > 0
+               : segs[j].stem_index_ + 1 < stems.size () ;
                      
-             bool event = on_bound
+             bool event = on_beam_bound
                || abs (segs[j].rank_ - segs[j+event_dir].rank_) > 1
                || (abs (vertical_count) >= segs[j].max_connect_
                    || abs (vertical_count) >= segs[j + event_dir].max_connect_);
@@ -423,7 +429,7 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common)
              current.horizontal_[event_dir] = segs[j].stem_x_;
              if (segs[j].dir_ == event_dir)
                {
-                 if (on_bound
+                 if (on_line_bound
                      && me->get_bound (event_dir)->break_status_dir ())
                    {
                      current.horizontal_[event_dir]
@@ -446,7 +452,7 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common)
                            = neighbor_stem->relative_coordinate (commonx, X_AXIS);
 
                          notehead_width = min (notehead_width,
-                                               fabs (neighbor_stem_x - segs[j].stem_x_)/2);
+                                               fabs (neighbor_stem_x - segs[j].stem_x_)/2.5);
                        }
                      current.horizontal_[event_dir] += event_dir * notehead_width;
                    }
@@ -848,6 +854,30 @@ Beam::calc_stem_shorten (SCM smob)
 }
 
 
+Interval
+Beam::no_visible_stem_positions (Grob *me, Interval default_value)
+{
+  extract_grob_set (me, "stems", stems);
+  if (stems.empty ())
+    return default_value;
+  
+  Interval head_positions;
+  Slice multiplicity;
+  for (vsize i = 0; i < stems.size(); i++)
+    {
+      head_positions.unite (Stem::head_positions (stems[i]));
+      multiplicity.unite (Stem::beam_multiplicity (stems[i]));
+    }
+
+  Direction dir = get_grob_direction (me);
+  Real y = head_positions[dir]
+    * 0.5 * Staff_symbol_referencer::staff_space (me)
+    + dir * get_beam_translation (me) * (multiplicity.length () + 1);
+
+  y /= Staff_symbol_referencer::staff_space (me);
+  return Interval (y,y);
+}
+
 
 /*
   Compute a first approximation to the beam slope.
@@ -863,7 +893,7 @@ Beam::calc_least_squares_positions (SCM smob, SCM posns)
   int count = normal_stem_count (me);
   Interval pos (0,0);
   if (count < 1)
-    return ly_interval2scm (pos);
+    return ly_interval2scm (no_visible_stem_positions (me, pos));
 
   vector<Real> x_posns;
   extract_grob_set (me, "normal-stems", stems);
@@ -1230,7 +1260,7 @@ Beam::set_stem_lengths (SCM smob)
        for normal beams, but for tremolo beams it looks silly otherwise.
       */
       if (gap
-          && !Stem::is_invisible (s))
+         && !Stem::is_invisible (s))
        stem_y += thick * 0.5 * get_grob_direction (s);
 
       /*