X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-placement.cc;h=a96f0e2542afdde9c4ad0cb894e99fb12d35675a;hb=44ad1d66c072e4d6545e75c769c86a460cb1df13;hp=f05a5e67f552b34a1f5b952af9dc4ba4fe6919d0;hpb=b6a8afbd0a9a0b36b07c114503d81a7c420e09e7;p=lilypond.git

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index f05a5e67f5..a96f0e2542 100644
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -9,6 +9,8 @@
 
 #include "accidental-placement.hh"
 
+#include "item.hh"
+#include "rhythmic-head.hh"
 #include "accidental-interface.hh"
 #include "music.hh"
 #include "note-collision.hh"
@@ -109,8 +111,8 @@ Accidental_placement::get_relevant_accidental_extent (Grob *me,
 
 struct Accidental_placement_entry
 {
-  vector<Skyline_entry> left_skyline_;
-  vector<Skyline_entry> right_skyline_;
+  Skyline left_skyline_;
+  Skyline right_skyline_;
   Interval vertical_extent_;
   vector<Box> extents_;
   vector<Grob*> grobs_;
@@ -135,6 +137,12 @@ int ape_compare (Accidental_placement_entry *const &a,
   return sign (ape_priority (a) - ape_priority (b));
 }
 
+bool ape_less (Accidental_placement_entry *const &a,
+	       Accidental_placement_entry *const &b)
+{
+  return ape_priority (a) < ape_priority (b);
+}
+
 int ape_rcompare (Accidental_placement_entry *const &a,
 		  Accidental_placement_entry *const &b)
 {
@@ -154,7 +162,7 @@ stagger_apes (vector<Accidental_placement_entry*> *apes)
 {
   vector<Accidental_placement_entry*> asc = *apes;
 
-  vector_sort (asc, &ape_compare);
+  vector_sort (asc, &ape_less);
 
   apes->clear ();
 
@@ -293,29 +301,23 @@ Accidental_placement::calc_positioning_done (SCM smob)
   for (vsize i = note_cols.size (); i--;)
     concat (heads, extract_grob_array (note_cols[i], "note-heads"));
 
-  vector_sort (heads, default_compare);
+  vector_sort (heads, less<Grob*> ());
   uniq (heads);
   common[Y_AXIS] = common_refpoint_of_array (heads, common[Y_AXIS], Y_AXIS);
 
   for (vsize i = apes.size (); i--;)
     {
       Accidental_placement_entry *ape = apes[i];
-      ape->left_skyline_ = empty_skyline (LEFT);
-      ape->right_skyline_ = empty_skyline (RIGHT);
 
       for (vsize j = apes[i]->grobs_.size (); j--;)
 	{
 	  Grob *a = apes[i]->grobs_[j];
-
 	  vector<Box> boxes = Accidental_interface::accurate_boxes (a, common);
 
 	  ape->extents_.insert (ape->extents_.end (), boxes.begin (), boxes.end ());
-	  for (vsize j = boxes.size (); j--;)
-	    {
-	      insert_extent_into_skyline (&ape->left_skyline_, boxes[j], Y_AXIS, LEFT);
-	      insert_extent_into_skyline (&ape->right_skyline_, boxes[j], Y_AXIS, RIGHT);
-	    }
 	}
+      ape->left_skyline_ = Skyline (ape->extents_, Y_AXIS, LEFT);
+      ape->right_skyline_ = Skyline (ape->extents_, Y_AXIS, RIGHT);
     }
 
   Interval total;
@@ -333,31 +335,43 @@ Accidental_placement::calc_positioning_done (SCM smob)
 
   Accidental_placement_entry *head_ape = new Accidental_placement_entry;
   common[X_AXIS] = common_refpoint_of_array (heads, common[X_AXIS], X_AXIS);
-  vector<Skyline_entry> head_skyline (empty_skyline (LEFT));
+  
   vector<Box> head_extents;
   for (vsize i = heads.size (); i--;)
-    {
-      Box b (heads[i]->extent (common[X_AXIS], X_AXIS),
-	     heads[i]->extent (common[Y_AXIS], Y_AXIS));
+    head_extents.push_back (Box (heads[i]->extent (common[X_AXIS], X_AXIS),
+				 heads[i]->extent (common[Y_AXIS], Y_AXIS)));
 
-      insert_extent_into_skyline (&head_skyline, b, Y_AXIS, LEFT);
+  vector<Grob *> stems;
+  for (vsize i = 0; i < heads.size  (); i++)
+    {
+      if (Grob *s = Rhythmic_head::get_stem (heads[i]))
+	stems.push_back (s);
+    }
+  
+  vector_sort (stems, less<Grob*> ());
+  uniq (stems);
+  for (vsize i = 0; i < stems.size (); i ++)
+    {
+      int very_large = INT_MAX;
+      
+      head_extents.push_back (Box (heads[i]->extent (common[X_AXIS], X_AXIS),
+				   heads[i]->pure_height (common[Y_AXIS], 0, very_large)));
     }
 
-  head_ape->left_skyline_ = head_skyline;
+  head_ape->left_skyline_ = Skyline (head_extents, Y_AXIS, LEFT);
   head_ape->offset_ = 0.0;
 
   Real padding = robust_scm2double (me->get_property ("padding"), 0.2);
 
-  vector<Skyline_entry> left_skyline = head_ape->left_skyline_;
-  heighten_skyline (&left_skyline,
-		    -robust_scm2double (me->get_property ("right-padding"), 0));
+  Skyline left_skyline = head_ape->left_skyline_;
+  left_skyline.raise (-robust_scm2double (me->get_property ("right-padding"), 0))
+;
   /*
     Add accs entries right-to-left.
   */
   for (vsize i = apes.size (); i-- > 0;)
     {
-      Real offset
-	= -skyline_meshing_distance (apes[i]->right_skyline_, left_skyline);
+      Real offset = -apes[i]->right_skyline_.distance (left_skyline);
       if (isinf (offset))
 	offset = (i < apes.size () - 1) ? apes[i + 1]->offset_ : 0.0;
       else
@@ -365,9 +379,9 @@ Accidental_placement::calc_positioning_done (SCM smob)
 
       apes[i]->offset_ = offset;
 
-      vector<Skyline_entry> new_left_skyline = apes[i]->left_skyline_;
-      heighten_skyline (&new_left_skyline, apes[i]->offset_);
-      merge_skyline (&new_left_skyline, left_skyline, LEFT);
+      Skyline new_left_skyline = apes[i]->left_skyline_;
+      new_left_skyline.raise (apes[i]->offset_);
+      new_left_skyline.merge (left_skyline);
       left_skyline = new_left_skyline;
     }
 
@@ -402,7 +416,6 @@ Accidental_placement::calc_positioning_done (SCM smob)
 }
 
 ADD_INTERFACE (Accidental_placement,
-	       "accidental-placement-interface",
 	       "Resolve accidental collisions.",
 
 	       /* properties */
@@ -410,4 +423,6 @@ ADD_INTERFACE (Accidental_placement,
 	       "left-padding "
 	       "padding "
 	       "positioning-done "
-	       "right-padding ")
+	       "right-padding "
+	       "script-priority "
+	       )