release: 0.1.55

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index dbbda19724442812cedb9b79779f8759d509d8d8..491e6d655fc8fa43af20734dbef021eec18e57d9 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -17,93 +17,100 @@ void
 Script::do_print() const
 {
 #ifndef NPRINT
-    specs_l_->print();
+  specs_l_->print();
 #endif
 }
 
 void
 Script::do_substitute_dependency (Score_elem*o,Score_elem*n)
 {
-    Staff_side::do_substitute_dependency (o,n);
-    if (o == stem_l_) {
-       stem_l_ = n ? (Stem*)n->item() : 0;
+  Staff_side::do_substitute_dependency (o,n);
+  if (o == stem_l_)
+    {
+      stem_l_ = n ? (Stem*)n->item() : 0;
     }
 }
 
 void
 Script::set_stem (Stem*st_l)
 {
-    stem_l_ = st_l;
-    add_support (st_l);
+  stem_l_ = st_l;
+  add_support (st_l);
 }
 
 
 Script::Script()
-{    
-    specs_l_ = 0;
-    inside_staff_b_ = false;
-    stem_l_ = 0;
-    dir_i_ =  0;
+{
+  specs_l_ = 0;
+  stem_l_ = 0;
+  dir_ =  CENTER;
 }
 
 void
 Script::set_default_dir()
 {
-    int s_i=specs_l_->rel_stem_dir_i();
-    if (s_i) { 
-       if (stem_l_)
-           dir_i_ = stem_l_->dir_i_ * s_i;
-       else{ 
-           specs_l_->warning ("Script needs stem direction");
-           dir_i_ = -1;
+  int s_i=specs_l_->rel_stem_dir();
+  if (s_i)
+    {
+      if (stem_l_)
+       dir_ = Direction(stem_l_->dir_ * s_i);
+      else
+       {
+         specs_l_->warning (_("Script needs stem direction"));
+         dir_ = DOWN;
        }
-    } else {
-       dir_i_ =specs_l_->staff_dir_i();
     }
-    assert (dir_i_);
+  else
+    {
+      dir_ =specs_l_->staff_dir();
+    }
+  assert (dir_);
 }
 
 
 Interval
 Script::do_width() const
 {
-    return specs_l_->get_atom (paper(), dir_i_).extent ().x ();
+  return specs_l_->get_atom (paper(), dir_).extent ().x ();
 }
 
 void
 Script::do_pre_processing()
 {
-    if  (breakable_b_ && break_status_i() != 1) {
-       transparent_b_ = empty_b_ = true;
+  if  (breakable_b_ && break_status_i() != 1)
+    {
+      transparent_b_ = true;
+      set_empty (true);
     }
-    
-    if (!dir_i_)
-       set_default_dir();
-    inside_staff_b_ = specs_l_->inside_b();
+
+  if (!dir_)
+    set_default_dir();
 }
 
 Interval
-Script::symbol_height()const
+Script::symbol_height() const
 {
-    return specs_l_->get_atom (paper(), dir_i_).extent ().y ();
+  return specs_l_->get_atom (paper(), dir_).extent ().y ();
 }
 
 Molecule*
 Script::brew_molecule_p() const
 {
-    Real dy = paper()->internote_f ();
-    
-    Molecule*out = new Molecule (specs_l_->get_atom (paper(), dir_i_));
-    out->translate (dy * pos_i_, Y_AXIS);
-    return out;
+  Real dx = paper()->note_width()/2;
+
+  Molecule*out = new Molecule (specs_l_->get_atom (paper(), dir_));
+  // ugh, staccato dots are not centred between stafflines (how?)?
+  Real correct = - (Real)dir_ * 2.0 * paper ()->rule_thickness ();
+  out->translate_axis (y_ + correct, Y_AXIS);
+  out->translate_axis (dx, X_AXIS);    // FIXME! ugh
+  return out;
 }
 
 
 IMPLEMENT_IS_TYPE_B2(Script,Item,Staff_side);
 
-int 
-Script::compare (Script  *const&l1, Script *const&l2) 
+int
+Script::compare (Script  *const&l1, Script *const&l2)
 {
-    return l1->specs_l_->priority_i() - l2->specs_l_->priority_i ();
+  return l1->specs_l_->priority_i() - l2->specs_l_->priority_i ();
 }
-