X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=0676e20f0289978d957ccabb64f798dea6e5343e;hb=0e0aa554eb6f3cd6004904746c54f8f95d6ccebf;hp=9d9231e549d107b193e3fa5097f90fce897a51f4;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 9d9231e549..0676e20f02 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -3,102 +3,90 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "script-column.hh"
-#include "debug.hh"
-#include "script.hh"
-#include "note-head.hh"
-#include "stem.hh"
-
-
-IMPLEMENT_IS_TYPE_B1(Script_column,Horizontal_vertical_group_item);
 
+#include "directional-element-interface.hh"
+#include "side-position-interface.hh"
+#include "warn.hh"
+#include "pointer-group-interface.hh"
 
 void
-Script_column::add (Script*s_l)
+Script_column::add_staff_sided (Grob *me, Item *item)
 {
-    script_l_arr_.push (s_l);
-    add_dependency (s_l);
-    add_element (s_l);
-}
+  SCM p = item->get_property ("script-priority");
+  if (!scm_is_number (p))
+    return;
 
-
-void
-Script_column::do_print()const
-{
-#ifndef NPRINT
-    DOUT << "scripts: " << script_l_arr_.size() << '\n'; 
-#endif
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"), item);
 }
 
-static int
-idx (bool inside, int dir)
+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.")
 {
-    int j = (dir+1);
-    if ( !inside)
-	j ++;
-    return j;
+  Grob *i1 = unsmob_grob (a);
+  Grob *i2 = unsmob_grob (b);
+
+  SCM p1 = i1->get_property ("script-priority");
+  SCM p2 = i2->get_property ("script-priority");
+
+  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)
 {
-    if (!script_l_arr_.size()) 
-	return;
-    
-    /* up+inside, up+outside, down+inside, down+outside */
-    Array<Script*> placed_l_arr_a[4];
-    for (int i=0; i < script_l_arr_.size(); i++) {
-	Script*s_l = script_l_arr_[i];
-	placed_l_arr_a[idx (s_l->inside_staff_b_ , s_l->dir_i_) ].push (s_l);
-    }
-    
-    for (int j =0; j <4; j++) {
-	placed_l_arr_a[j].sort (Script::compare);
+  Grob *me = unsmob_grob (smob);
+  Drul_array<SCM> scripts_drul (SCM_EOL, SCM_EOL);
+  vector<Grob*> staff_sided;
+
+  extract_grob_set (me, "scripts", scripts);
+  for (vsize i = 0; i < scripts.size (); 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);
 
-    for (int j =0; j < 4; j++) {
-	if (placed_l_arr_a[j].size())
-	    for (int i=0; i  < support_l_arr_.size(); i++)
-		placed_l_arr_a[j][0]->add_support (support_l_arr_[i]);
-    }
-    
-    Item * support_l=0;
-    int j = 0;
-    for (; j < 2; j++) {
-	for (int i=0; i < placed_l_arr_a[j].size(); i++) {
-	    if (support_l)
-		placed_l_arr_a[j][i]->add_support (support_l);
-	    support_l = placed_l_arr_a[j][i];
-	}
+      scripts_drul[d] = scm_cons (g->self_scm (), scripts_drul[d]);
     }
-    support_l = 0;
-    for (; j < 4; j++) {
-	for (int i=0; i < placed_l_arr_a[j].size(); i++) {
-	    if (support_l)
-		placed_l_arr_a[j][i]->add_support (support_l);
-	    support_l = placed_l_arr_a[j][i];
-	}
-    }
-}
 
+  Direction 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);
 
-void
-Script_column::add_support (Item*i_l)
-{
-    support_l_arr_.push (i_l);
-    add_dependency (i_l);
-    add_element (i_l);
-}
+      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);
 
-void
-Script_column::do_substitute_dependency (Score_elem*o,Score_elem*n)
-{
-    if (o->item()) {
-	script_l_arr_.substitute ((Script*)o->item(),(Script*) (n?n->item ():0));
-	support_l_arr_.substitute (o->item(), (n?n->item ():0));
+	  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}",
+	       "");