release: 0.0.77.jcn1

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

diff --git a/lily/script-def.cc b/lily/script-def.cc
index 7d1b09d4afda0cea635f0dd0e5616d04b0d7b921..5475ec8cf2369df2959d72d0b3613b3393d62aba 100644 (file)
--- a/lily/script-def.cc
+++ b/lily/script-def.cc
@@ -15,7 +15,7 @@
 Script_def::Script_def()
 {
     inside_staff_b_ = false;
-    symidx = "unknown" ;
+    symidx_str_ = "unknown" ;
     rel_stem_dir_i_ =0;
     staff_dir_i_ = -1;
     invertsym_b_ = 0;
@@ -23,29 +23,31 @@ Script_def::Script_def()
 }
 
 void
-Script_def::set_from_input(String idx,  bool follow, int stem, int staff ,bool invert)
+Script_def::set_from_input(String idx,  bool follow, int stem, int staff ,bool invert, int priority_i)
 {
     inside_staff_b_ = follow;
-    symidx = idx ;
+    symidx_str_ = idx ;
     rel_stem_dir_i_ =stem;
     staff_dir_i_ = staff;
     invertsym_b_ = invert;
-    priority_i_ =0;
+    priority_i_ =priority_i;
 }
 
 
 void
-Script_def::print() const
+Script_def::do_print() const
 {
-    mtor << "Script_def{ idx: " << symidx 
+#ifndef NPRINT
+    mtor << "Script_def{ idx: " << symidx_str_ 
         << " direction, stem: " << rel_stem_dir_i_ << " staff : " << staff_dir_i_ << "}\n";
+#endif
 }
 
 bool
 Script_def::do_equal_b(General_script_def const &g)const 
 {
     Script_def const & c = (Script_def const&) g;
-    return !(symidx == c.symidx &&
+    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_);
@@ -76,10 +78,11 @@ Script_def::get_atom(Paper_def *p , int d)const
     if (invertsym_b_&& d < 0) 
        preidx_str = "-";
 
-    return p->lookup_l()->script(preidx_str + symidx);
+    return p->lookup_l()->script(preidx_str + symidx_str_);
 }
 
-IMPLEMENT_STATIC_NAME(Script_def);
+
+IMPLEMENT_IS_TYPE_B1(Script_def,General_script_def);
 
 int
 Script_def::priority_i()const