* flower/include/std-string.hh:

[lilypond.git] / lily / script-column.cc

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 8b37895814543a3bea6664c65456196779dda2ea..0676e20f0289978d957ccabb64f798dea6e5343e 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,77 +1,92 @@
-/*   
-  g-script-column.cc --  implement Script_column
-  
+/*
+  script-column.cc -- implement Script_column
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include "script-column.hh"
-#include "staff-side.hh"
-#include "dimension-cache.hh"
 
-static Staff_side_item *
-get_Staff_side (Item *i)
-{
-  Graphical_element *e1 = i->dim_cache_[Y_AXIS]->parent_l_->element_l ();
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-  return dynamic_cast<Staff_side_item*>(e1);
-}
+#include "script-column.hh"
+
+#include "directional-element-interface.hh"
+#include "side-position-interface.hh"
+#include "warn.hh"
+#include "pointer-group-interface.hh"
 
 void
-Script_column::add_staff_sided (Item *i)
+Script_column::add_staff_sided (Grob *me, Item *item)
 {
-  SCM p = get_Staff_side (i)->get_elt_property (script_priority_scm_sym);
-  if (p == SCM_BOOL_F)
+  SCM p = item->get_property ("script-priority");
+  if (!scm_is_number (p))
     return;
-  
-  staff_sided_item_l_arr_.push (i);
-  add_dependency (i);
+
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"), item);
 }
 
-static int
-staff_side_compare (Item * const &i1,
-                   Item * const &i2)
+LY_DEFINE (ly_grob_script_priority_less, "ly:grob-script-priority-less",
+          2, 0, 0, (SCM a, SCM b),
+          "Compare two grobs by script priority. For internal use.")
 {
-  Score_element *e1 = get_Staff_side (i1);
-  Score_element *e2 = get_Staff_side (i2);
+  Grob *i1 = unsmob_grob (a);
+  Grob *i2 = unsmob_grob (b);
 
-  SCM p1 = e1->get_elt_property (script_priority_scm_sym);
-  SCM p2 = e2->get_elt_property (script_priority_scm_sym);
+  SCM p1 = i1->get_property ("script-priority");
+  SCM p2 = i2->get_property ("script-priority");
 
-  return gh_scm2int (SCM_CDR(p1)) - gh_scm2int (SCM_CDR(p2));
+  return scm_to_int (p1) < scm_to_int (p2) ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
-void
-Script_column::do_pre_processing ()
+MAKE_SCHEME_CALLBACK (Script_column, before_line_breaking, 1);
+SCM
+Script_column::before_line_breaking (SCM smob)
 {
-  Drul_array<Link_array<Item> > arrs;
+  Grob *me = unsmob_grob (smob);
+  Drul_array<SCM> scripts_drul (SCM_EOL, SCM_EOL);
+  vector<Grob*> staff_sided;
 
-  for (int i=0; i < staff_sided_item_l_arr_.size (); i++)
+  extract_grob_set (me, "scripts", scripts);
+  for (vsize i = 0; i < scripts.size (); i++)
     {
-      Staff_side_item * ip = get_Staff_side (staff_sided_item_l_arr_[i]);
-      arrs[ip->dir_].push (staff_sided_item_l_arr_[i]);
+      Grob *sc = scripts[i];
+
+      /*
+       Don't want to consider scripts horizontally next to notes.
+      */
+      if (sc->get_property_data (ly_symbol2scm ("X-offset")) !=
+         Side_position_interface::x_aligned_side_proc)
+       staff_sided.push_back (sc);
+    }
+
+  for (vsize i = 0; i < staff_sided.size (); i++)
+    {
+      Grob *g = staff_sided[i];
+      Direction d = get_grob_direction (g);
+
+      scripts_drul[d] = scm_cons (g->self_scm (), scripts_drul[d]);
     }
 
   Direction d = DOWN;
-  do {
-    Link_array<Item> &arr(arrs[d]);
-    
-    arr.sort (staff_side_compare);
-
-    Item * last = 0;
-    for (int i=0; i < arr.size (); i++)
-      {
-       Staff_side_item * gs = get_Staff_side (arr[i]);
-       if (last)
-         {
-           gs->add_support (last);
-           gs->add_support (get_Staff_side (last));
-         }
-           
-       gs->remove_elt_property (script_priority_scm_sym);
-       last = arr[i];
-      }
-    
-  } while (flip (&d) != DOWN);
+  do
+    {
+      SCM ss = scm_reverse_x (scripts_drul[d], SCM_EOL);
+      ss = scm_stable_sort_x (ss, ly_grob_script_priority_less_proc);
+
+      Grob *last = 0;
+      for (SCM s = ss; scm_is_pair (s); s = scm_cdr (s))
+       {
+         Grob *g = unsmob_grob (scm_car (s));
+         if (last)
+           Side_position_interface::add_support (g, last);
+
+         last = g;
+       }
+    }
+  while (flip (&d) != DOWN);
+
+  return SCM_UNSPECIFIED;
 }
+
+ADD_INTERFACE (Script_column, "script-column-interface",
+              "An interface that sorts scripts "
+              "according to their @code{script-priority}",
+              "");