From: fred <fred>
Date: Sun, 24 Mar 2002 19:56:11 +0000 (+0000)
Subject: lilypond-0.1.11
X-Git-Tag: release/1.5.59~3978
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e78c58ec9fbe8bcce1e082e178095c0598d6c18b;p=lilypond.git

lilypond-0.1.11
---

diff --git a/lily/template2.cc b/lily/template2.cc
index 67c24f5a58..e6961b4ac7 100644
--- a/lily/template2.cc
+++ b/lily/template2.cc
@@ -10,4 +10,4 @@
 #include "plist.tcc"
 #include "pcursor.tcc"
 
- template IPL_INSTANTIATE(Line_spacer);
+template POINTERLIST_INSTANTIATE(Line_spacer);
diff --git a/lily/template3.cc b/lily/template3.cc
index 2e368d5219..9e6e7e6dce 100644
--- a/lily/template3.cc
+++ b/lily/template3.cc
@@ -13,5 +13,5 @@
 #include "plist.tcc"
 #include "pcursor.tcc"
 
-template IPL_INSTANTIATE(Atom);
-template IPL_INSTANTIATE(Input_translator);
+template POINTERLIST_INSTANTIATE(Atom);
+template POINTERLIST_INSTANTIATE(Input_translator);
diff --git a/lily/template6.cc b/lily/template6.cc
index e8f04f8122..dd7bf02997 100644
--- a/lily/template6.cc
+++ b/lily/template6.cc
@@ -3,5 +3,5 @@
 #include "engraver.hh"
 #include "performer.hh"
 
-template IPL_INSTANTIATE(Engraver);
-template IPL_INSTANTIATE(Performer);
+template POINTERLIST_INSTANTIATE(Engraver);
+template POINTERLIST_INSTANTIATE(Performer);
diff --git a/lily/template7.cc b/lily/template7.cc
index b36c232753..b288b4c289 100644
--- a/lily/template7.cc
+++ b/lily/template7.cc
@@ -14,5 +14,5 @@
 #include "music-list.hh"
 #include "music-iterator.hh"
 
-template IPL_INSTANTIATE(Music);
-template IPL_INSTANTIATE(Music_iterator);
+template POINTERLIST_INSTANTIATE(Music);
+template POINTERLIST_INSTANTIATE(Music_iterator);
diff --git a/lily/tie-grav.cc b/lily/tie-grav.cc
index 660d1da948..f1b3463c31 100644
--- a/lily/tie-grav.cc
+++ b/lily/tie-grav.cc
@@ -21,13 +21,13 @@ Tie_engraver::Tie_engraver()
   end_mom_ = -1;
   melodic_req_l_ = 0;
   end_melodic_req_l_ =0;
-  dir_i_ = 0;
+  dir_ = CENTER;
 }
 
 void
 Tie_engraver::sync_features()
 {
-  dir_i_ = get_feature ("vdir");
+  dir_ = Direction (int (get_feature ("vdir")));
 }
   
 
@@ -82,14 +82,14 @@ Tie_engraver::acknowledge_element (Score_elem_info i)
     {
 	if (tie_p_) 
 	  {
-	    tie_p_->set_head (-1, (Note_head*)i.elem_l_->item());
+	    tie_p_->set_head (LEFT, (Note_head*)i.elem_l_->item());
 	    melodic_req_l_ = i.req_l_->musical()->melodic ();
 	  }
 
 	if (end_tie_p_) 
 	  {
-	    end_tie_p_->set_head (1, (Note_head*)i.elem_l_->item());
-	    if (!Melodic_req::compare ( *end_melodic_req_l_, *melodic_req_l_))
+	    end_tie_p_->set_head (RIGHT, (Note_head*)i.elem_l_->item());
+	    if (!Melodic_req::compare (*end_melodic_req_l_, *melodic_req_l_))
 		end_tie_p_->same_pitch_b_ = true;
 	    announce_element (Score_elem_info (end_tie_p_,end_req_l_));
 	  }
@@ -101,8 +101,8 @@ Tie_engraver::do_pre_move_processing()
 {
   if (end_tie_p_) 
     {
-	if (dir_i_)
-	    end_tie_p_->dir_i_ =  dir_i_;
+	if (dir_)
+	    end_tie_p_->dir_ =  dir_;
 	
 	typeset_element (end_tie_p_);
 	end_tie_p_ =0;
@@ -124,7 +124,7 @@ void
 Tie_engraver::set_feature (Feature f)
 {
   if (f.type_ == "vdir")
-	dir_i_ = f.value_;
+	dir_ = Direction (int (f.value_));
 }