lilypond-0.1.11

diff --git a/lily/template2.cc b/lily/template2.cc
index 67c24f5a58a719bd6f02de65e7afd2e680aa9da4..e6961b4ac721e50f89e10d74c65c0b261806c35e 100644 (file)
--- 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 2e368d5219ecb2dc453b450e5a393bf183843803..9e6e7e6dcebd3ad524c7070483d607b7854d144e 100644 (file)
--- 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 e8f04f81224345d6b1b6acfd38e7211477553057..dd7bf02997752ce741ece68639e66ac964c287e5 100644 (file)
--- 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 b36c23275373da1581f1ae217a5355cb8ecd72ca..b288b4c289974001e8474bd754036f97ae07f3c2 100644 (file)
--- 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 660d1da9488fa05a8ec8c518e956e4e5c5876587..f1b3463c3111ba86023a819548b926d30e561973 100644 (file)
--- 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_));
 }