release: 1.3.70

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

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 67d5577bd23990c16e7d54a18f48ea5048b57329..fcdc933f9aa39c0eb43d1a8d245719c0cf207a4e 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -3,103 +3,26 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "moment.hh"
 #include "paper-column.hh"
 #include "paper-score.hh"
 #include "debug.hh"
+#include "axis-group-interface.hh"
+#include "spaceable-element.hh"
 
 void
-Paper_column::add_rod (Paper_column * p, Real d)
+Paper_column::do_break_processing ()
 {
-  Direction dir =  Direction (sign (p->rank_i ()  - rank_i ()));
-  
-  if (!dir)
-    {
-      programming_error ("Must set minimum distance between differing columns.");
-      return;
-    }
-  
-  for (int i=0; i < minimal_dists_arr_drul_[dir].size (); i++)
-    {
-      Column_rod &rod = minimal_dists_arr_drul_[dir][i];
-      if (rod.other_l_ == p)
-       {
-         rod.distance_f_ = rod.distance_f_ >? d;
-         return ;
-       }
-    }
-
-  Column_rod cr;
-  cr.distance_f_ = d;
-  cr.other_l_ = p;
-
-  minimal_dists_arr_drul_[dir].push (cr);
-}
-
-void
-Paper_column::add_spring (Paper_column * p, Real d, Real s)
-{
-  Direction dir =  Direction (sign (p->rank_i ()  - rank_i ()));
-  
-  if (!dir)
-    {
-      warning (_ ("Must set spring between differing columns"));
-      return;
-    }
-  
-  for (int i=0; i < spring_arr_drul_[dir].size (); i++)
-    {
-      Column_spring &spring = spring_arr_drul_[dir][i];
-      if (spring.other_l_ == p)
-       {
-         spring.distance_f_ = spring.distance_f_ >? d;
-         return ;
-       }
-    }
-
-  Column_spring cr;
-  cr.distance_f_ = d;
-  cr.strength_f_ = s;  
-  cr.other_l_ = p;
-
-  spring_arr_drul_[dir].push (cr);
+  Spaceable_element::remove_interface(this);
+  Item::do_break_processing ();
 }
 
 int
-Paper_column::rank_i() const
+Paper_column::rank_i(Score_element*me) 
 {
-  return rank_i_;
-}
-
-void
-Paper_column::set_rank (int i)
-{
-  rank_i_ = i;
-}
-
-void
-Paper_column::do_print() const
-{
-#ifndef NPRINT
-  DEBUG_OUT << "rank: " << rank_i_ << '\n';
-  Direction d = LEFT;
-  do
-    {
-      for (int i=0; i < minimal_dists_arr_drul_[d].size (); i++)
-       {
-         minimal_dists_arr_drul_[d][i].print ();
-       }
-      for (int i=0; i < spring_arr_drul_[d].size (); i++)
-       {
-         spring_arr_drul_[d][i].print ();
-       }
-      
-    }
-  while ((flip (&d))!=LEFT);
-  Item::do_print ();
-#endif 
+  return dynamic_cast<Paper_column*> (me)->rank_i_;
 }
 
 Line_of_score*
@@ -108,35 +31,31 @@ Paper_column::line_l() const
   return line_l_;
 }
 
-
-
-
 Paper_column*
 Paper_column::column_l () const
 {
   return (Paper_column*)(this);
 }
 
-
-
-
-Paper_column::Paper_column (Moment w)
+Paper_column::Paper_column (SCM l)
+  : Item (l)           // guh.?
 {
-  set_elt_property ("when", (new Moment (w))->smobify_self ());
-  set_axes (X_AXIS, X_AXIS);
-
+  Axis_group_interface::set_interface (this);
+  Axis_group_interface::set_axes (this, X_AXIS, X_AXIS);
+  Spaceable_element::set_interface (this);
+  set_elt_property ("bounded-by-me", SCM_EOL);
   line_l_=0;
   rank_i_ = -1;
 }
 
 Moment
-Paper_column::when_mom () const
+Paper_column::when_mom (Score_element*me)
 {
-  SCM m = get_elt_property ("when");
+  SCM m = me->get_elt_property ("when");
   Moment s (0);
-  if (SMOB_IS_TYPE_B(Moment, m))
+  if (unsmob_moment (m))
     {
-      s = *SMOB_TO_TYPE (Moment,m);
+      return *unsmob_moment (m);
     }
   return s;
 }
@@ -144,11 +63,19 @@ Paper_column::when_mom () const
 bool
 Paper_column::musical_b () const
 {
-  SCM m = get_elt_property ("shortest-starter");
+  SCM m = get_elt_property ("shortest-starter-duration");
   Moment s (0);
-  if (SMOB_IS_TYPE_B(Moment, m))
+  if (unsmob_moment (m))
     {
-      s = *SMOB_TO_TYPE (Moment,m);
+      s = *unsmob_moment (m);
     }
   return s != Moment(0);
 }
+
+bool
+Paper_column::used_b (Score_element*me )
+{
+  return gh_pair_p (me->get_elt_property ("elements")) ||  Item::breakable_b (me)
+    || gh_pair_p (me->get_elt_property ("bounded-by-me"))
+    ;
+}