X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=311f5cbb7c4f264e19790b4c2cd99607c5de6128;hb=e3a368ad1c8dc7a06491ffc4305d68d8d6e8305e;hp=637eb42dec6cf1ac5ce27ea4b6149f187788b09f;hpb=3132736f1b95477ac562eb94f3a8536423e55e1c;p=lilypond.git

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 637eb42dec..311f5cbb7c 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,108 +1,99 @@
-/*
-  script-column.cc -- implement Script_column
-
-  source file of the LilyPond music typesetter
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
+/*   
+  script-column.cc --  implement Script_column
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
 
 #include "script-column.hh"
-#include "debug.hh"
-#include "script.hh"
-#include "notehead.hh"
-#include "stem.hh"
-
-IMPLEMENT_STATIC_NAME(Script_column);
 
+#include "side-position-interface.hh"
+#include "warn.hh"
+#include "group-interface.hh"
 
 void
-Script_column::add(Script*s_l)
+Script_column::add_staff_sided (Grob *me, Item *i)
 {
-    script_l_arr_.push(s_l);
-    add_dependency(s_l);
-}
+  SCM p = i->get_property ("script-priority");
+  if (!scm_is_number (p))
+    return;
 
-void
-Script_column::translate(Offset o)
-{
-    for (int i=0; i < script_l_arr_.size(); i++) 
-	script_l_arr_[i]->translate(o);
-    for (int i=0; i < support_l_arr_.size(); i++)
-    	support_l_arr_[i]->translate(o);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"),i);
+  
+  me->add_dependency (i);
 }
 
-
-void
-Script_column::do_print()const
+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.")
 {
-    mtor << "scripts: " << script_l_arr_.size() << '\n'; 
-}
+  Grob *i1 = unsmob_grob (a);
+  Grob *i2 = unsmob_grob (b);
 
-Interval
-Script_column::do_height()const return r
-{
-    for (int i=0; i < script_l_arr_.size(); i++) 
-	r.unite(script_l_arr_[i]->height());
-}
+  SCM p1 = i1->get_property ("script-priority");
+  SCM p2 = i2->get_property ("script-priority");
 
-Interval
-Script_column::do_width()const 
-{
-    Interval r;
-    for (int i=0; i < script_l_arr_.size(); i++) 
-	r.unite(script_l_arr_[i]->width());
-    return r;
+  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+outside, up+inside, down+outside, down+inside */
-    Array<Script*> placed_l_arr_a[4];
-    for (int i=0; i < script_l_arr_.size(); i++) {
-	Script*s_l = script_l_arr_[i];
-	int j = (s_l->dir_i_ >0) ? 0 : 2;
-	if (!s_l->inside_staff_b_) 
-	    j ++;
-	
-	placed_l_arr_a[j].push(s_l);
-    }
-    
-    for (int j =0; j <4; j++) {
-	placed_l_arr_a[j].sort( Script::compare);
-    }
-
-
-    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=1; 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];
-	}
+  Grob* me = unsmob_grob (smob);
+  Drul_array<SCM> scripts (SCM_EOL, SCM_EOL);
+  Link_array<Grob> staff_sided;
+  
+  for (SCM s = me->get_property ("scripts"); scm_is_pair (s); s = scm_cdr (s))
+    {
+      Grob *sc = unsmob_grob (scm_car (s));
+
+      /*
+	Don't want to consider scripts horizontally next to notes.
+       */
+      if (!sc->has_offset_callback (Side_position_interface::aligned_side_proc,
+				    X_AXIS))
+	staff_sided.push (sc);
     }
-    support_l = 0;
-    for (; j < 4; j++ ) {
-	for (int i=1; 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];
+  
+  for (int i = 0; i < staff_sided.size (); i++)
+    {
+      Grob* g = staff_sided[i];
+      Direction d = Side_position_interface::get_direction (g);
+      if (!d)
+	{
+	  programming_error ( "No direction for script?");
+	  d = DOWN;
+	  g->set_property ("direction", scm_int2num (d));
 	}
+      
+      scripts[d] = scm_cons (g->self_scm (), scripts[d]);
     }
-}
 
+  Direction d = DOWN;
+  do
+    {
+      SCM ss = scm_reverse_x (scripts[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);
 
-void
-Script_column::add_support(Item*i_l)
-{
-    support_l_arr_.push(i_l);
-    add_dependency(i_l);
+  return SCM_UNSPECIFIED;
 }
+
+ADD_INTERFACE (Script_column,"script-column-interface",
+	       "An interface that sorts scripts "
+	       "according to their @code{script-priority}",
+	       "");