* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/script-column.cc b/lily/script-column.cc
index ef676502b062d4a79e05079407d01db0cd4b3be8..2a6e38bea4702759aa816f233518768928e0aa45 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,95 +1,91 @@
-/*
-  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--2002 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;
 
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"),i);
+  
+  me->add_dependency (i);
+}
 
-void
-Script_column::do_print()const
+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.")
 {
-    mtor << "scripts: " << script_l_arr_.size() << '\n'; 
+  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+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);
+  Grob* me = unsmob_grob (smob);
+  Drul_array<SCM> scripts (SCM_EOL, SCM_EOL);
+  Link_array<Grob> staff_sided 
+    = Pointer_group_interface__extract_grobs (me, (Grob*)0, "scripts");
+                                    
+  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);
     
-    for (int j =0; j <4; j++) {
-       placed_l_arr_a[j].sort( Script::compare);
-    }
+    ss = scm_stable_sort_x (ss,  grob_script_priority_less_proc);
 
+    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);
 
-    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];
-       }
-    }
-    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];
-       }
-    }
+       last = g;
+      }
+    
+  } 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));
-    }
-}