lilypond-0.0.70pre

diff --git a/lily/include/script-def.hh b/lily/include/script-def.hh
index 8313abad46b48475d1f201b2dc09a5ece2e231f8..94f60905285db658c36306cdd38aa072ab14a5d1 100644 (file)
--- a/lily/include/script-def.hh
+++ b/lily/include/script-def.hh
@@ -14,7 +14,7 @@
 class Script_def : public General_script_def {
     /// invert if below staff?
     bool invertsym_b_;
-    String symidx;
+    String symidx_str_;
     
 
     /// on the other side of the stem?
@@ -38,11 +38,11 @@ public:
     NAME_MEMBERS();
 
     virtual bool do_equal_b(General_script_def const &)const;
-    void print() const;
+    virtual void do_print() const;
     Script_def();
-    void set_from_input(String, bool, int, int ,bool);
+    void set_from_input(String, bool, int, int ,bool,int );
 protected:
-    VIRTUAL_COPY_CONS(Script_def,General_script_def)
+    VIRTUAL_COPY_CONS(Script_def,General_script_def);
 
 };
 

diff --git a/lily/script-def.cc b/lily/script-def.cc
index b07bbc71a8f05c726ca4b916db077d7cc367d70b..38b2608f25bf149ab604735903f7275ddf699f45 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,7 +78,7 @@ 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);