From 464db2f533bda93fdee6483ed05f73672864dd7a Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 23:09:56 +0000
Subject: [PATCH] lilypond-1.3.37

---
 lily/paper-column.cc  | 12 ++++--------
 lily/score-element.cc | 17 ++++-------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 14f1340464..2f225d0718 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -109,25 +109,20 @@ 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)
 {
   SCM when = (new Moment (w))->smobify_self ();
   scm_unprotect_object (when);
   set_elt_property ("when", when);
-  
-  axis_group (this).set_axes (X_AXIS, X_AXIS);
+
+  Axis_group_interface (this).set_interface ();
+  Axis_group_interface (this).set_axes (X_AXIS, X_AXIS);
 
   line_l_=0;
   rank_i_ = -1;
@@ -156,3 +151,4 @@ Paper_column::musical_b () const
     }
   return s != Moment(0);
 }
+
diff --git a/lily/score-element.cc b/lily/score-element.cc
index a2d31ab4a5..4f1870886a 100644
--- a/lily/score-element.cc
+++ b/lily/score-element.cc
@@ -81,19 +81,6 @@ Score_element::~Score_element()
   delete dim_cache_[Y_AXIS];  
 }
 
-
-Real
-Score_element::get_real (String s) const
-{
-  return gh_scm2double (get_elt_property (s));
-}
-
-void
-Score_element::set_real (String s, Real r)
-{
-  set_elt_property (s, gh_double2scm (r));
-}
-
 // should also have one that takes SCM arg. 
 SCM
 Score_element::get_elt_property (String nm) const
@@ -569,6 +556,10 @@ Score_element::fixup_refpoint ()
 	{
 	  Score_element * newparent = parent->find_broken_piece (line_l ());
 	  set_parent (newparent, ax);
+	  if (!newparent)
+	    {
+	      programming_error ("Orphaned score-element.");
+	    }
 	}
 
       if (Item * i  = dynamic_cast<Item*> (this))
-- 
2.39.5