partial: 0.1.61.jcn

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 2ac99301990edf59749788b714db94bf14aa1f69..491e6d655fc8fa43af20734dbef021eec18e57d9 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -25,7 +25,7 @@ void
 Script::do_substitute_dependency (Score_elem*o,Score_elem*n)
 {
   Staff_side::do_substitute_dependency (o,n);
-  if (o == stem_l_) 
+  if (o == stem_l_)
     {
       stem_l_ = n ? (Stem*)n->item() : 0;
     }
@@ -40,9 +40,8 @@ Script::set_stem (Stem*st_l)
 
 
 Script::Script()
-{    
+{
   specs_l_ = 0;
-  inside_staff_b_ = false;
   stem_l_ = 0;
   dir_ =  CENTER;
 }
@@ -51,17 +50,17 @@ void
 Script::set_default_dir()
 {
   int s_i=specs_l_->rel_stem_dir();
-  if (s_i) 
+  if (s_i)
     {
       if (stem_l_)
-       dir_ = stem_l_->dir_ * s_i;
+       dir_ = Direction(stem_l_->dir_ * s_i);
       else
        {
-         specs_l_->warning ("Script needs stem direction");
+         specs_l_->warning (_("Script needs stem direction"));
          dir_ = DOWN;
        }
     }
-  else 
+  else
     {
       dir_ =specs_l_->staff_dir();
     }
@@ -78,15 +77,14 @@ Script::do_width() const
 void
 Script::do_pre_processing()
 {
-  if  (breakable_b_ && break_status_i() != 1) 
+  if  (breakable_b_ && break_status_i() != 1)
     {
       transparent_b_ = true;
       set_empty (true);
     }
-  
+
   if (!dir_)
     set_default_dir();
-  inside_staff_b_ = specs_l_->inside_b();
 }
 
 Interval
@@ -98,11 +96,12 @@ Script::symbol_height() const
 Molecule*
 Script::brew_molecule_p() const
 {
-  Real dy = paper()->internote_f ();
   Real dx = paper()->note_width()/2;
-  
+
   Molecule*out = new Molecule (specs_l_->get_atom (paper(), dir_));
-  out->translate_axis (dy * pos_i_, Y_AXIS);
+  // 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;
 }
@@ -110,9 +109,8 @@ Script::brew_molecule_p() const
 
 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 ();
 }
-