X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=2fd32623b842d78e05b7e5bc1309c1d0b221a3c8;hb=237583408aaf3b2192c388c3183d9c57fb051bd0;hp=bfbe2f7be5863b2429c14a822bb18b35d8e97afc;hpb=1d7d22c0171288be6009b68e611beaed18be993c;p=lilypond.git

diff --git a/lily/script-column.cc b/lily/script-column.cc
index bfbe2f7be5..2fd32623b8 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,119 +1,97 @@
-/*
-  script-column.cc -- implement Script_column
-
+/*   
+  script-column.cc --  implement Script_column
+  
   source file of the GNU LilyPond music typesetter
-
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.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"
-#include "general-script-def.hh"
+#include "side-position-interface.hh"
+#include "warn.hh"
+#include "group-interface.hh"
 
 void
-Script_column::add_script (Script*s_l)
+Script_column::add_staff_sided (Grob *me, Item *i)
 {
-  script_l_arr_.push (s_l);
-  add_dependency (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
-  DOUT << "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");
 
-Script_column::Script_column ()
-{
-  set_axes (X_AXIS,X_AXIS);
+  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->specs_p_->inside_b(),
-			  s_l->dir_) ].push (s_l);
-    }
+  Grob* me = unsmob_grob (smob);
+  Drul_array<SCM> scripts (SCM_EOL, SCM_EOL);
+  Link_array<Grob> staff_sided;
   
-  for (int j =0; j <4; j++) 
+  for (SCM s  = me->get_grob_property( "scripts");  gh_pair_p (s); s = gh_cdr( s))
     {
-      placed_l_arr_a[j].sort (Script::compare);
-    }
-
+      Grob *sc = unsmob_grob (gh_car (s));
 
-  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]);
+      if (!sc->has_offset_callback_b (Side_position_interface::aligned_side_proc, X_AXIS))
+	staff_sided.push (sc);
     }
   
-  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 < staff_sided.size (); i++)
     {
-      for (int i=0; i < placed_l_arr_a[j].size(); i++) 
+      Grob* g = staff_sided[i];
+      Direction d = Side_position_interface::get_direction (g);
+      if (!d)
 	{
-	  if (support_l)
-	    placed_l_arr_a[j][i]->add_support (support_l);
-	  support_l = placed_l_arr_a[j][i];
+	  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);
 
-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; gh_pair_p (s); s = gh_cdr (s))
+      {
+	Grob* g = unsmob_grob (gh_car (s));
+	if (last)
+	  Side_position_interface::add_support (g,last);
 
-void
-Script_column::do_substitute_element_pointer (Score_element*o,Score_element*n)
-{
-  if (dynamic_cast <Item *> (o)) 
-    {
-      script_l_arr_.substitute (dynamic_cast<Script *> (o),
-				dynamic_cast <Script *> (n));
-      support_l_arr_.substitute (dynamic_cast <Item *> (o),
-				 dynamic_cast <Item *> (n));
-    }
+	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}",
+  "");
+
+