release: 0.1.55

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index b350c8e7c91a0ac39946c8901ebc5c9f4de5c471..491e6d655fc8fa43af20734dbef021eec18e57d9 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,11 +1,11 @@
 /*
   script.cc -- implement Script
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
-
+#include "script-def.hh"
 #include "musical-request.hh"
 #include "paper-def.hh"
 #include "script.hh"
@@ -13,92 +13,104 @@
 #include "molecule.hh"
 #include "lookup.hh"
 
-
-
 void
-Script::set_stem(Stem*st_l)
+Script::do_print() const
 {
-    stem_l_ = st_l;
-    add_support(st_l);
+#ifndef NPRINT
+  specs_l_->print();
+#endif
 }
 
-
-Script::Script(Script_req* rq)
-    :Staff_side(this)
-{    
-    specs_l_ = rq->scriptdef_p_;
-    inside_staff_b_ = specs_l_->inside_staff_b_;
-    stem_l_ = 0;
-    pos_i_ = 0;
-    symdir_i_=1;
-    dir_i_ =rq->dir_i_;
+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;
+    }
 }
 
 void
-Script::set_symdir()
+Script::set_stem (Stem*st_l)
 {
-    if (specs_l_->invertsym_b_)
-       symdir_i_ = (dir_i_ < 0) ? -1:1;
+  stem_l_ = st_l;
+  add_support (st_l);
 }
 
-void
-Script::set_default_dir()
+
+Script::Script()
 {
-    int s_i=specs_l_->rel_stem_dir_i_;
-    if (s_i && stem_l_)
-       dir_i_ = stem_l_->dir_i_ * s_i;
-    else {
-       dir_i_ =specs_l_->staff_dir_i_;
-    }
+  specs_l_ = 0;
+  stem_l_ = 0;
+  dir_ =  CENTER;
 }
 
 void
-Script::set_default_index()
+Script::set_default_dir()
 {
-    pos_i_ = get_position_i(symbol().dim.y);
+  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_ =specs_l_->staff_dir();
+    }
+  assert (dir_);
 }
 
+
 Interval
 Script::do_width() const
 {
-    return symbol().dim.x;
-}
-
-Symbol
-Script::symbol()const
-{
-    String preidx_str = (symdir_i_ < 0) ?"-" :"";
-    return paper()->lookup_l()->script(preidx_str + specs_l_->symidx);
+  return specs_l_->get_atom (paper(), dir_).extent ().x ();
 }
 
 void
 Script::do_pre_processing()
 {
-    if (!dir_i_)
-       set_default_dir();
-    set_symdir();
+  if  (breakable_b_ && break_status_i() != 1)
+    {
+      transparent_b_ = true;
+      set_empty (true);
+    }
+
+  if (!dir_)
+    set_default_dir();
 }
 
-void
-Script::do_post_processing()
+Interval
+Script::symbol_height() const
 {
-    set_default_index();
+  return specs_l_->get_atom (paper(), dir_).extent ().y ();
 }
 
 Molecule*
 Script::brew_molecule_p() const
 {
-    Real dy = paper()->internote();
-    
-    Molecule*out = new Molecule(Atom(symbol()));
-    out->translate(Offset(0,dy * pos_i_));
-    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_STATIC_NAME(Script);
 
-int 
-Script::compare(Script  *const&l1, Script *const&l2) 
+
+IMPLEMENT_IS_TYPE_B2(Script,Item,Staff_side);
+
+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 ();
 }
-