patch::: 1.3.8.uu1

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index bf013593992603eda50f878399f4c6177a05b572..a0636017532ea5dd9ebf9b56f0ba65e7f1506e90 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,111 +1,84 @@
+/*   
+     script.cc --  implement Script
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
+
 /*
-  script.cc -- implement Script
 
-  source file of the GNU LilyPond music typesetter
+  TODO: Quantisation support (staccato dots between stafflines)
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
-#include "script-def.hh"
-#include "musical-request.hh"
-#include "paper-def.hh"
+#include "debug.hh"
 #include "script.hh"
-#include "stem.hh"
-#include "molecule.hh"
 #include "lookup.hh"
+#include "staff-side.hh"
+#include "paper-def.hh"
+#include "dimension-cache.hh"
 
-void
-Script::do_print() const
-{
-#ifndef NPRINT
-    specs_l_->print();
-#endif
-}
 
-void
-Script::do_substitute_dependency(Score_elem*o,Score_elem*n)
+Molecule
+Script::get_molecule(Direction d) const
 {
-    Staff_side::do_substitute_dependency(o,n);
-    if (o == stem_l_) {
-       stem_l_ = n ? (Stem*)n->item() : 0;
-    }
-}
+  SCM s = get_elt_property ("molecule");
+  assert (s != SCM_UNDEFINED);
 
-void
-Script::set_stem(Stem*st_l)
-{
-    stem_l_ = st_l;
-    add_support(st_l);
-}
+  SCM key = SCM_CAR (s);
+  if (key == ly_symbol2scm ("feta"))
+    {
+      return lookup_l ()->afm_find ("scripts-" +
+                                   ly_scm2string (index_cell (gh_cdr (s), d)));
+    }
+  else if (key == ly_symbol2scm ("accordion"))
+    {
+      return lookup_l ()->accordion (s, paper_l()->get_var("interline"));
+    }
 
+  else assert (false);
 
-Script::Script()
-{    
-    specs_l_ = 0;
-    inside_staff_b_ = false;
-    stem_l_ = 0;
-    pos_i_ = 0;
-    dir_i_ =  0;
+  return Molecule ();
 }
 
-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;
-       }
-    } else {
-       dir_i_ =specs_l_->staff_dir_i();
-    }
-    assert(dir_i_);
-}
 
 void
-Script::set_default_index()
-{
-    pos_i_ = get_position_i(specs_l_->get_atom(paper(), dir_i_).extent().y);
-}
-
-Interval
-Script::do_width() const
+Script::do_pre_processing ()
 {
-    return specs_l_->get_atom(paper(), dir_i_).extent().x;
+  /*
+    center my self on the note head.
+   */
+  Graphical_element * e = parent_l(X_AXIS);
+  translate_axis (e->extent (X_AXIS).center (), X_AXIS);
 }
 
 void
-Script::do_pre_processing()
+Script::do_post_processing ()
 {
-    if (!dir_i_)
-       set_default_dir();
-    inside_staff_b_ = specs_l_->inside_b();
-}
+  Direction d =  Side_position_interface (this).get_direction ();
+  Molecule m (get_molecule(d));
 
-void
-Script::do_post_processing()
-{
-    set_default_index();
+  /*
+    UGH UGH UGH
+   */
+#if 0
+  if (staff_side_l_->get_elt_property ("no-staff-support") == SCM_UNDEFINED) 
+    translate_axis (- m.dim_[Y_AXIS][Direction (-d)], Y_AXIS);
+#endif
 }
 
+
 Molecule*
-Script::brew_molecule_p() const
+Script::do_brew_molecule_p () const
 {
-    Real dy = paper()->internote_f();
-    
-    Molecule*out = new Molecule(specs_l_->get_atom(paper(), dir_i_));
-    out->translate_y(dy * pos_i_);
-    return out;
+  Direction dir = DOWN;
+  SCM d = get_elt_property ("direction");
+  if (isdir_b (d))
+    dir = to_dir (d);
+  
+  return new Molecule (get_molecule (dir));
 }
 
-IMPLEMENT_STATIC_NAME(Script);
-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();
-}
-    
+