From: fred <fred>
Date: Tue, 26 Mar 2002 21:45:51 +0000 (+0000)
Subject: lilypond-1.1.19
X-Git-Tag: release/1.5.59~2652
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5f03e6f941b971d2234380113b75a24c2498fe4c;p=lilypond.git

lilypond-1.1.19
---

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index f7eebd9e42..e5ef4b1b78 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -10,7 +10,7 @@
 #include "extender-spanner.hh"
 #include "text-def.hh"
 #include "score-column.hh"
-#include "text-item.hh"
+#include "g-text-item.hh"
 
 ADD_THIS_TRANSLATOR (Extender_engraver);
 
@@ -23,7 +23,7 @@ Extender_engraver::Extender_engraver ()
 void
 Extender_engraver::acknowledge_element (Score_element_info i)
 {
-  Text_item* t = (dynamic_cast<Text_item*> (i.elem_l_));
+  G_text_item* t = dynamic_cast<G_text_item*> (i.elem_l_);
   if (!t)
     return;
   if (!extender_spanner_p_)
@@ -31,10 +31,10 @@ Extender_engraver::acknowledge_element (Score_element_info i)
   if (!span_reqs_drul_[LEFT])
     return;
 
-  if (!extender_spanner_p_->textitem_l_drul_[LEFT])
+  if (!extender_spanner_p_->item_l_drul_[LEFT])
     extender_spanner_p_->set_textitem (LEFT, t);
   else
-    if (span_reqs_drul_[RIGHT] && !extender_spanner_p_->textitem_l_drul_[RIGHT]) 
+    if (span_reqs_drul_[RIGHT] && !extender_spanner_p_->item_l_drul_[RIGHT]) 
       extender_spanner_p_->set_textitem (RIGHT, t);
 }
 
diff --git a/lily/include/extender-spanner.hh b/lily/include/extender-spanner.hh
index 8e0f657fb5..a69d10f3e8 100644
--- a/lily/include/extender-spanner.hh
+++ b/lily/include/extender-spanner.hh
@@ -35,10 +35,9 @@ public:
   virtual ~Extender_spanner ();
 
   Offset center () const;  
-  void set_textitem (Direction, Text_item*);
+  void set_textitem (Direction, Item*);
 
-  Drul_array<Text_item *> textitem_l_drul_;
- 
+  Drul_array<Item *> item_l_drul_;	// should use teh spanpoints field of item.
 protected:
   virtual Molecule* do_brew_molecule_p () const;
   void do_add_processing ();