From: fred <fred>
Date: Tue, 26 Mar 2002 22:44:07 +0000 (+0000)
Subject: lilypond-1.3.10
X-Git-Tag: release/1.5.59~1956
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7957c43650a093e55f47ffa15a0a8aca5c6a7fa9;p=lilypond.git

lilypond-1.3.10
---

diff --git a/lily/extender-spanner.cc b/lily/extender-spanner.cc
index 513011d5c0..a9eb6640c5 100644
--- a/lily/extender-spanner.cc
+++ b/lily/extender-spanner.cc
@@ -10,7 +10,8 @@
   TODO: too complicated implementation.  Why the dx_drul?.
  */
 
-
+#
+#include "dimension-cache.hh"
 #include "box.hh"
 #include "debug.hh"
 #include "lookup.hh"
@@ -23,23 +24,18 @@ Extender_spanner::Extender_spanner ()
   : Directional_spanner ()
 {
   dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0;
+  dim_cache_[Y_AXIS]->set_callback (Dimension_cache::point_dimension_callback);
 }
 
 
-Offset
-Extender_spanner::center () const
-{
-  Real dx = extent (X_AXIS).length ();
 
-  return Offset (dx / 2, 0);
-}
 
 Molecule*
 Extender_spanner::do_brew_molecule_p () const
 {
   Molecule* mol_p = new Molecule;
 
-  Real w = extent (X_AXIS).length ();
+  Real w = spanner_length ();
   
   w += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
   Real h = paper_l ()->get_var ("extender_height");
@@ -51,11 +47,7 @@ Extender_spanner::do_brew_molecule_p () const
   return mol_p;
 }
 
-Interval
-Extender_spanner::do_height () const
-{
-  return Interval (0,0);
-}
+
 
 void
 Extender_spanner::do_post_processing ()
diff --git a/lily/hyphen-spanner.cc b/lily/hyphen-spanner.cc
index 5d2fa9598e..ebb02d18d4 100644
--- a/lily/hyphen-spanner.cc
+++ b/lily/hyphen-spanner.cc
@@ -20,20 +20,14 @@
 #include "paper-column.hh"
 #include "paper-def.hh"
 #include "hyphen-spanner.hh"
+#include "dimension-cache.hh"
 
 Hyphen_spanner::Hyphen_spanner ()
   : Directional_spanner ()
 {
   dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0;
-}
-
-// UGH - is this even used?
-Offset
-Hyphen_spanner::center () const
-{
-  Real dx = extent (X_AXIS).length ();
 
-  return Offset (dx / 2, 0);
+  dim_cache_[Y_AXIS]->set_callback (Dimension_cache::point_dimension_callback);
 }
 
 Molecule*
@@ -41,7 +35,7 @@ Hyphen_spanner::do_brew_molecule_p () const
 {
   Molecule* mol_p = new Molecule;
 
-  Real w = extent (X_AXIS).length ();
+  Real w = spanner_length ();
 
   w += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
 
@@ -61,11 +55,6 @@ Hyphen_spanner::do_brew_molecule_p () const
   return mol_p;
 }
 
-Interval
-Hyphen_spanner::do_height () const
-{
-  return Interval (0,0);
-}
 
 void
 Hyphen_spanner::do_post_processing ()