release: 0.1.11

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

diff --git a/lily/script-column.cc b/lily/script-column.cc
index bc309b1e04bdfac3e4de7fab0525c2f87b0cb06a..6f9359aef7c46fce45dd5b706746c304097dc62a 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -1,7 +1,7 @@
 /*
   script-column.cc -- implement Script_column
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -9,98 +9,104 @@
 #include "script-column.hh"
 #include "debug.hh"
 #include "script.hh"
-#include "notehead.hh"
+#include "note-head.hh"
 #include "stem.hh"
 
-IMPLEMENT_STATIC_NAME(Script_column);
 
+IMPLEMENT_IS_TYPE_B1(Script_column,Horizontal_vertical_group_item);
 
-void
-Script_column::add(Script*s_l)
-{
-    script_l_arr_.push(s_l);
-    add_dependency(s_l);
-}
 
 void
-Script_column::translate(Offset o)
+Script_column::add (Script*s_l)
 {
-    for (int i=0; i < script_l_arr_.size(); i++) 
-       script_l_arr_[i]->translate(o);
+  script_l_arr_.push (s_l);
+  add_dependency (s_l);
+  add_element (s_l);
 }
 
 
 void
-Script_column::do_print()const
-{
-    mtor << "scripts: " << script_l_arr_.size() << '\n'; 
-}
-
-Interval
-Script_column::do_height()const return r
+Script_column::do_print() const
 {
-    for (int i=0; i < script_l_arr_.size(); i++) 
-       r.unite(script_l_arr_[i]->height());
+#ifndef NPRINT
+  DOUT << "scripts: " << script_l_arr_.size() << '\n'; 
+#endif
 }
 
-Interval
-Script_column::do_width()const 
+static int
+idx (bool inside, int dir)
 {
-    Interval r;
-    for (int i=0; i < script_l_arr_.size(); i++) 
-       r.unite(script_l_arr_[i]->width());
-    return r;
+  int j = (dir+1);
+  if (!inside)
+    j ++;
+  return j;
 }
 
 void
 Script_column::do_pre_processing()
 {
-    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);
+  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_) ].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++) 
+    {
+      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]);
+  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];
+  
+  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=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=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];
        }
     }
 }
 
 
 void
-Script_column::add_support(Item*i_l)
+Script_column::add_support (Item*i_l)
 {
-    support_l_arr_.push(i_l);
-    add_dependency(i_l);
+  support_l_arr_.push (i_l);
+  add_dependency (i_l);
+  add_element (i_l);
+}
+
+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));
+    }
 }