X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=c8adf5694d80f60f8ed2a4121d84d87ada830911;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=843278aff38e8b8f97c645ba73d24ed3f329ab6b;hpb=91da88e63b390a40589fc1ee679f52b6dee03a17;p=lilypond.git

diff --git a/lily/beam.cc b/lily/beam.cc
index 843278aff3..c8adf5694d 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -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"));
 	}
     }
 
@@ -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;
 		    }
@@ -555,9 +561,15 @@ Beam::print (SCM grob)
     }
 	 
 #if (DEBUG_BEAM_SCORING)
-  SCM quant_score = me->get_property ("quant-score");
-  SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring"));
-  if (to_boolean (debug) && scm_is_string (quant_score))
+  SCM annotation = me->get_property ("annotation");
+  if (!scm_is_string (annotation))
+    {
+      SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring"));
+      if (to_boolean (debug))
+	annotation = me->get_property ("quant-score");
+    }
+  
+  if (scm_is_string (annotation))
     {
       extract_grob_set (me, "stems", stems);      
 
@@ -572,10 +584,13 @@ Beam::print (SCM grob)
       Direction stem_dir = stems.size () ? to_dir (stems[0]->get_property ("direction")) : UP;
 
       Stencil score = *unsmob_stencil (Text_interface::interpret_markup
-				    (me->layout ()->self_scm (), properties, quant_score));
+				    (me->layout ()->self_scm (), properties, annotation));
 
       if (!score.is_empty ())
-	the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0);
+	{
+	  score.translate_axis (me->relative_coordinate(commonx, X_AXIS), X_AXIS);
+	  the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0);
+	}
     }
 #endif
 
@@ -848,6 +863,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 +902,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 +1269,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);
 
       /*
@@ -1484,16 +1523,15 @@ Beam::get_direction_beam_count (Grob *me, Direction d)
 }
 
 ADD_INTERFACE (Beam,
-
-	       "A beam. \n\n"
-	       "The @code{thickness} property is the weight of beams, "
-	       "measured in staffspace.  The @code{direction} "
-	       "property is not user-serviceable. Use "
-	       "the @code{direction} property of @code{Stem} instead. "
-
-	       ,
+	       "A beam.\n"
+	       "\n"
+	       "The @code{thickness} property is the weight of beams,"
+	       " measured in staffspace.  The @code{direction} property is"
+	       " not user-serviceable.  Use the @code{direction} property"
+	       " of @code{Stem} instead.",
 	       
 	       /* properties */
+	       "annotation "
 	       "auto-knee-gap "
 	       "beamed-stem-shorten "
 	       "beaming "
@@ -1502,7 +1540,7 @@ ADD_INTERFACE (Beam,
 	       "concaveness "
 	       "damping "
 	       "details "
-	       "direction " 
+	       "direction "
 	       "gap "
 	       "gap-count "
 	       "grow-direction "