* The grand 2005-2006 replace.

[lilypond.git] / lily / slur-scoring.cc

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 9701fe094c08945e65208b356ac9bb6d72b28dbb..57fa3c6183e4a938c83921cc5b3c3ec9050abbf5 100644 (file)
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -77,7 +77,7 @@ get_detail (SCM alist, SCM sym)
 void
 Slur_score_parameters::fill (Grob *me)
 {
-  SCM details = me->get_property ("slur-details");
+  SCM details = me->get_property ("details");
 
   region_size_
     = (int) get_detail (details, ly_symbol2scm ("region-size"));
@@ -103,8 +103,8 @@ Slur_score_parameters::fill (Grob *me)
     = get_detail (details, ly_symbol2scm ("free-head-distance"));
   absolute_closeness_measure_
     = get_detail (details, ly_symbol2scm ("absolute-closeness-measure"));
-  extra_object_collision_
-    = get_detail (details, ly_symbol2scm ("extra-object-collision"));
+  extra_object_collision_penalty_
+    = get_detail (details, ly_symbol2scm ("extra-object-collision-penalty"));
   accidental_collision_
     = get_detail (details, ly_symbol2scm ("accidental-collision"));
   extra_encompass_free_distance_
@@ -236,38 +236,41 @@ Slur_score_state::get_bound_info () const
        {
          extremes[d].note_column_ = extremes[d].bound_;
          extremes[d].stem_ = Note_column::get_stem (extremes[d].note_column_);
-         extremes[d].stem_dir_ = get_grob_direction (extremes[d].stem_);
-
-         for (int a = X_AXIS; a < NO_AXES; a++)
+         if (extremes[d].stem_)
            {
-             Axis ax = Axis (a);
-             Interval s = extremes[d].stem_->extent (common_[ax], ax);
-             if (s.is_empty ())
+             extremes[d].stem_dir_ = get_grob_direction (extremes[d].stem_);
+
+             for (int a = X_AXIS; a < NO_AXES; a++)
                {
-                 /*
-                   do not issue warning. This happens for rests and
-                   whole notes.
-                 */
-                 s = Interval (0, 0)
-                   + extremes[d].stem_->relative_coordinate (common_[ax], ax);
+                 Axis ax = Axis (a);
+                 Interval s = extremes[d].stem_->extent (common_[ax], ax);
+                 if (s.is_empty ())
+                   {
+                     /*
+                       do not issue warning. This happens for rests and
+                       whole notes.
+                     */
+                     s = Interval (0, 0)
+                       + extremes[d].stem_->relative_coordinate (common_[ax], ax);
+                   }
+                 extremes[d].stem_extent_[ax] = s;
                }
-             extremes[d].stem_extent_[ax] = s;
-           }
 
-         extremes[d].slur_head_
-           = Stem::extremal_heads (extremes[d].stem_)[dir];
-         if (!extremes[d].slur_head_
-             && Note_column::has_rests (extremes[d].bound_))
-           extremes[d].slur_head_ = Note_column::get_rest (extremes[d].bound_);
+             extremes[d].slur_head_
+               = Stem::extremal_heads (extremes[d].stem_)[dir];
+             if (!extremes[d].slur_head_
+                 && Note_column::has_rests (extremes[d].bound_))
+               extremes[d].slur_head_ = Note_column::get_rest (extremes[d].bound_);
+             extremes[d].staff_ = Staff_symbol_referencer
+               ::get_staff_symbol (extremes[d].stem_);
+             extremes[d].staff_space_ = Staff_symbol_referencer
+               ::staff_space (extremes[d].stem_);
+           }
 
          if (extremes[d].slur_head_)
-           extremes[d].slur_head_extent_
+           extremes[d].slur_head_x_extent_
              = extremes[d].slur_head_->extent (common_[X_AXIS], X_AXIS);
 
-         extremes[d].staff_ = Staff_symbol_referencer
-           ::get_staff_symbol (extremes[d].stem_);
-         extremes[d].staff_space_ = Staff_symbol_referencer
-           ::staff_space (extremes[d].stem_);
        }
     }
   while (flip (&d) != LEFT);
@@ -343,7 +346,8 @@ Slur_score_state::fill (Grob *me)
   Direction d = LEFT;
   do
     {
-      if (!is_broken_)
+      if (!is_broken_
+         && extremes_[d].slur_head_)
        musical_dy_ += d
          * extremes_[d].slur_head_->relative_coordinate (common_[Y_AXIS], Y_AXIS);
     }
@@ -598,6 +602,9 @@ Real
 Slur_score_state::move_away_from_staffline (Real y,
                                            Grob *on_staff) const
 {
+  if (!on_staff)
+    return y;
+  
   Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (on_staff);
   if (!staff_symbol)
     return y;
@@ -635,19 +642,30 @@ Slur_score_state::generate_avoid_offsets () const
 
   extract_grob_set (slur_, "encompass-objects", extra_encompasses);
   for (int i = 0; i < extra_encompasses.size (); i++)
-    if (Slur::has_interface (extra_encompasses[i]))
-      {
-       Grob *small_slur = extra_encompasses[i];
-       Bezier b = Slur::get_curve (small_slur);
+    {
+      if (Slur::has_interface (extra_encompasses[i]))
+       {
+         Grob *small_slur = extra_encompasses[i];
+         Bezier b = Slur::get_curve (small_slur);
 
-       Offset z = b.curve_point (0.5);
-       z += Offset (small_slur->relative_coordinate (common_[X_AXIS], X_AXIS),
-                    small_slur->relative_coordinate (common_[Y_AXIS], Y_AXIS));
+         Offset z = b.curve_point (0.5);
+         z += Offset (small_slur->relative_coordinate (common_[X_AXIS], X_AXIS),
+                      small_slur->relative_coordinate (common_[Y_AXIS], Y_AXIS));
 
-       z[Y_AXIS] += dir_ * parameters_.free_slur_distance_;
-       avoid.push (z);
-      }
+         z[Y_AXIS] += dir_ * parameters_.free_slur_distance_;
+         avoid.push (z);
+       }
+      else if (extra_encompasses[i]->get_property ("avoid-slur") == ly_symbol2scm ("inside"))
+       {
+         Grob *g = extra_encompasses [i];
+         Interval xe = g->extent (common_[X_AXIS], X_AXIS);
+         Interval ye = g->extent (common_[Y_AXIS], Y_AXIS);
 
+         if (!xe.is_empty ()
+             && !ye.is_empty ())
+           avoid.push (Offset (xe.center(), ye[dir_]));
+       }
+    }  
   return avoid;
 }
 
@@ -712,9 +730,9 @@ Slur_score_state::enumerate_attachments (Drul_array<Real> end_ys) const
              do
                {
                  if (extremes_[d].slur_head_
-                     && !extremes_[d].slur_head_extent_.is_empty ())
+                     && !extremes_[d].slur_head_x_extent_.is_empty ())
                    {
-                     os[d][X_AXIS] = extremes_[d].slur_head_extent_.center ();
+                     os[d][X_AXIS] = extremes_[d].slur_head_x_extent_.center ();
                      attach_to_stem[d] = false;
                    }
                }
@@ -732,7 +750,7 @@ Slur_score_state::enumerate_attachments (Drul_array<Real> end_ys) const
 
                     TODO: parameter */
                  os[d][X_AXIS]
-                   -= dir_ * extremes_[d].slur_head_extent_.length ()
+                   -= dir_ * extremes_[d].slur_head_x_extent_.length ()
                    * sin (dz.arg ()) / 3;
                }
            }
@@ -792,7 +810,7 @@ Slur_score_state::get_extra_encompass_infos () const
                                         k - 1.0,
                                         xext,
                                         yext,
-                                        parameters_.extra_object_collision_);
+                                        parameters_.extra_object_collision_penalty_);
              collision_infos.push (info);
            }
        }
@@ -803,7 +821,7 @@ Slur_score_state::get_extra_encompass_infos () const
          Interval ye = g->extent (common_[Y_AXIS], Y_AXIS);
 
          Real xp = 0.0;
-         Real penalty = parameters_.extra_object_collision_;
+         Real penalty = parameters_.extra_object_collision_penalty_;
          if (Accidental_interface::has_interface (g))
            {
              penalty = parameters_.accidental_collision_;
@@ -847,4 +865,21 @@ Slur_score_state::get_extra_encompass_infos () const
 
   return collision_infos;
 }
+ 
+Extra_collision_info::Extra_collision_info (Grob *g, Real idx, Interval x, Interval y, Real p)
+{
+  idx_ = idx;
+  extents_[X_AXIS] = x;
+  extents_[Y_AXIS] = y;
+  penalty_ = p;
+  grob_ = g;
+  type_ = g->get_property ("avoid-slur");
+}
 
+Extra_collision_info::Extra_collision_info ()
+{
+  idx_ = 0.0;
+  penalty_ = 0.;
+  grob_ = 0;
+  type_ = SCM_EOL; 
+}