release: 1.3.40

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

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 7c5e0c26844884bed8961b33e42414238516ad70..2f225d0718d55fb6eba1b11183ec34a274666702 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -3,12 +3,13 @@
 
   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"
 
 void
 Paper_column::add_rod (Paper_column * p, Real d)
@@ -102,43 +103,52 @@ Paper_column::do_print() const
 #endif 
 }
 
-bool
-Paper_column::breakpoint_b() const
-{
-  return !line_l_;
-}
-
-Paper_column::Paper_column()
-{
-  set_axes (X_AXIS, X_AXIS);
-
-  line_l_=0;
-  rank_i_ = -1;
-}
-
 Line_of_score*
 Paper_column::line_l() const
 {
   return line_l_;
 }
 
-
-
-
 Paper_column*
 Paper_column::column_l () const
 {
   return (Paper_column*)(this);
 }
 
-/*
-  ugh.
- */
-void
-Paper_column::preprocess ()
+Paper_column::Paper_column (Moment w)
 {
-  minimal_dists_arr_drul_[LEFT].sort (Column_rod::compare);
-  minimal_dists_arr_drul_[RIGHT].sort (Column_rod::compare);  
-  spring_arr_drul_[LEFT].sort (Column_spring::compare);
-  spring_arr_drul_[RIGHT].sort (Column_spring::compare);  
+  SCM when = (new Moment (w))->smobify_self ();
+  scm_unprotect_object (when);
+  set_elt_property ("when", when);
+
+  Axis_group_interface (this).set_interface ();
+  Axis_group_interface (this).set_axes (X_AXIS, X_AXIS);
+
+  line_l_=0;
+  rank_i_ = -1;
+}
+
+Moment
+Paper_column::when_mom () const
+{
+  SCM m = get_elt_property ("when");
+  Moment s (0);
+  if (SMOB_IS_TYPE_B(Moment, m))
+    {
+      s = *SMOB_TO_TYPE (Moment,m);
+    }
+  return s;
+}
+  
+bool
+Paper_column::musical_b () const
+{
+  SCM m = get_elt_property ("shortest-starter-duration");
+  Moment s (0);
+  if (SMOB_IS_TYPE_B(Moment, m))
+    {
+      s = *SMOB_TO_TYPE (Moment,m);
+    }
+  return s != Moment(0);
 }
+