release: 0.1.11

[lilypond.git] / lily / script-def.cc

diff --git a/lily/script-def.cc b/lily/script-def.cc
index 6a53aba9827bb4f781b8779f9d83927dfe036823..6ece2874f582880172417783ebea320048fc17f1 100644 (file)
--- a/lily/script-def.cc
+++ b/lily/script-def.cc
@@ -16,8 +16,8 @@ Script_def::Script_def()
 {
   inside_staff_b_ = false;
   symidx_str_ = "unknown" ;
-  rel_stem_dir_i_ =0;
-  staff_dir_i_ = -1;
+  rel_stem_dir_ =CENTER;
+  staff_dir_ = DOWN;
   invertsym_b_ = 0;
   priority_i_ =0;
 }
@@ -27,8 +27,8 @@ Script_def::set_from_input (String idx,  bool follow, int stem, int staff ,bool
 {
   inside_staff_b_ = follow;
   symidx_str_ = idx ;
-  rel_stem_dir_i_ =stem;
-  staff_dir_i_ = staff;
+  rel_stem_dir_ =Direction(stem);
+  staff_dir_ = Direction(staff);
   invertsym_b_ = invert;
   priority_i_ =priority_i;
 }
@@ -39,30 +39,30 @@ Script_def::do_print() const
 {
 #ifndef NPRINT
   DOUT << "Script_def{ idx: " << symidx_str_ 
-        << " direction, stem: " << rel_stem_dir_i_ << " staff : " << staff_dir_i_ << "}\n";
+       << " direction, stem: " << rel_stem_dir_ << " staff : " << staff_dir_ << "}\n";
 #endif
 }
 
 bool
-Script_def::do_equal_b (General_script_def const *g)const 
+Script_def::do_equal_b (General_script_def const *g) const 
 {
   Script_def const * c = (Script_def const*) g;
   return (symidx_str_ == c->symidx_str_ &&
-            rel_stem_dir_i_ == c->rel_stem_dir_i_&&
-            staff_dir_i_ == c->staff_dir_i_&&
-            invertsym_b_ == c->invertsym_b_);
+         rel_stem_dir_ == c->rel_stem_dir_&&
+         staff_dir_ == c->staff_dir_&&
+         invertsym_b_ == c->invertsym_b_);
 }
 
-int
-Script_def::staff_dir_i() const
+Direction
+Script_def::staff_dir() const
 {
-  return staff_dir_i_; 
+  return staff_dir_; 
 }
 
-int
-Script_def::rel_stem_dir_i() const
+Direction
+Script_def::rel_stem_dir() const
 {
-  return rel_stem_dir_i_; 
+  return rel_stem_dir_; 
 }
 
 bool
@@ -72,11 +72,11 @@ Script_def::inside_b() const
 }
 
 Atom
-Script_def::get_atom (Paper_def *p , int d)const
+Script_def::get_atom (Paper_def *p , Direction d) const
 {
   String preidx_str ="";
   if (invertsym_b_&& d < 0) 
-       preidx_str = "-";
+    preidx_str = "-";
 
   return p->lookup_l()->script (preidx_str + symidx_str_);
 }
@@ -85,7 +85,7 @@ Script_def::get_atom (Paper_def *p , int d)const
 IMPLEMENT_IS_TYPE_B1(Script_def,General_script_def);
 
 int
-Script_def::priority_i()const
+Script_def::priority_i() const
 {
   return priority_i_;
 }