X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fscript-column.cc;h=2fd32623b842d78e05b7e5bc1309c1d0b221a3c8;hb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;hp=b49fbd48f5a72618b371d4b11e336b7a62fefe61;hpb=6ce61146edb1c36647b514778c29cdc9beedab6a;p=lilypond.git

diff --git a/lily/script-column.cc b/lily/script-column.cc
index b49fbd48f5..2fd32623b8 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,103 +1,97 @@
-/*
-  script-column.cc -- implement Script_column
-
+/*   
+  script-column.cc --  implement Script_column
+  
   source file of the GNU LilyPond music typesetter
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
+  
+  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
 #include "script-column.hh"
-#include "debug.hh"
-#include "script.hh"
-#include "note-head.hh"
-#include "stem.hh"
-
-IMPLEMENT_STATIC_NAME(Script_column);
-IMPLEMENT_IS_TYPE_B1(Script_column,Horizontal_vertical_group_item);
-
+#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_element(s_l);
-}
-
+  SCM p = i->get_grob_property ("script-priority");
+  if (!gh_number_p (p))
+    return;
 
-void
-Script_column::do_print()const
-{
-#ifndef NPRINT
-    mtor << "scripts: " << script_l_arr_.size() << '\n'; 
-#endif
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"),i);
+  
+  me->add_dependency (i);
 }
 
-static int
-idx(bool inside, int dir)
+LY_DEFINE(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_grob_property ("script-priority");
+  SCM p2 = i2->get_grob_property ("script-priority");
+
+  return gh_scm2int (p1) < gh_scm2int (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);
+  Grob* me = unsmob_grob (smob);
+  Drul_array<SCM> scripts (SCM_EOL, SCM_EOL);
+  Link_array<Grob> staff_sided;
+  
+  for (SCM s  = me->get_grob_property( "scripts");  gh_pair_p (s); s = gh_cdr( s))
+    {
+      Grob *sc = unsmob_grob (gh_car (s));
+
+      if (!sc->has_offset_callback_b (Side_position_interface::aligned_side_proc, X_AXIS))
+	staff_sided.push (sc);
     }
-    
-    for (int j =0; j <4; j++) {
-	placed_l_arr_a[j].sort( Script::compare);
+  
+  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_grob_property ("direction", gh_int2scm (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,  grob_script_priority_less_proc);
 
-    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]);
-    }
+    Grob * last = 0;
+    for (SCM s = ss; gh_pair_p (s); s = gh_cdr (s))
+      {
+	Grob* g = unsmob_grob (gh_car (s));
+	if (last)
+	  Side_position_interface::add_support (g,last);
+
+	last = g;
+      }
     
-    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];
-	}
-    }
-    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];
-	}
-    }
+  } while (flip (&d) != DOWN);
+
+  return SCM_UNSPECIFIED;
 }
 
 
-void
-Script_column::add_support(Item*i_l)
-{
-    support_l_arr_.push(i_l);
-    add_element(i_l);
-}
+ADD_INTERFACE (Script_column,"script-column-interface",
+  "An interface that sorts scripts according to their @code{script-priority}",
+  "");
+
 
-void
-Script_column::do_substitute_dependency(Score_elem*o,Score_elem*n)
-{
-    Horizontal_vertical_group::do_substitute_dependency(o,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));
-    }
-}