patch::: 1.3.8.uu1

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 576a9fdb9b90af120233af7b074b818fcad6dc9e..a0636017532ea5dd9ebf9b56f0ba65e7f1506e90 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,134 +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--1999 Han-Wen Nienhuys <hanwen@cs.uu.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"
-
-void
-Script::do_print () const
-{
-#ifndef NPRINT
-  specs_p_->print ();
-#endif
-}
-
-void
-Script::do_substitute_element_pointer (Score_element*o,Score_element*n)
-{
-  Staff_side::do_substitute_element_pointer (o,n);
-  if (o == stem_l_)
-    {
-      stem_l_ = dynamic_cast<Stem *> (n);
-    }
-}
-
-void
-Script::set_stem (Stem*st_l)
-{
-  stem_l_ = st_l;
-  add_support (st_l);
-}
+#include "staff-side.hh"
+#include "paper-def.hh"
+#include "dimension-cache.hh"
 
 
-Script::Script ()
+Molecule
+Script::get_molecule(Direction d) const
 {
-  axis_ = Y_AXIS;
-  specs_p_ = 0;
-  stem_l_ = 0;
-  dir_ =  CENTER;
-}
+  SCM s = get_elt_property ("molecule");
+  assert (s != SCM_UNDEFINED);
 
-void
-Script::set_default_dir ()
-{
-  int s_i=specs_p_->rel_stem_dir ();
-  if (s_i)
+  SCM key = SCM_CAR (s);
+  if (key == ly_symbol2scm ("feta"))
     {
-      if (stem_l_)
-       dir_ = Direction (stem_l_->dir_ * s_i);
-      else
-       {
-         specs_p_->warning (_ ("script needs stem direction"));
-         dir_ = DOWN;
-       }
+      return lookup_l ()->afm_find ("scripts-" +
+                                   ly_scm2string (index_cell (gh_cdr (s), d)));
     }
-  else
+  else if (key == ly_symbol2scm ("accordion"))
     {
-      dir_ =specs_p_->staff_dir ();
+      return lookup_l ()->accordion (s, paper_l()->get_var("interline"));
     }
-  assert (dir_);
-}
 
+  else assert (false);
 
-Interval
-Script::do_width () const
-{
-  return specs_p_->get_molecule (paper_l (), dir_).extent ().x ();
+  return Molecule ();
 }
 
+
 void
 Script::do_pre_processing ()
 {
-  Staff_side::do_pre_processing ();
-  if (axis_ == Y_AXIS && !dir_)
-    set_default_dir ();
+  /*
+    center my self on the note head.
+   */
+  Graphical_element * e = parent_l(X_AXIS);
+  translate_axis (e->extent (X_AXIS).center (), X_AXIS);
 }
 
-Interval
-Script::symbol_height () const
+void
+Script::do_post_processing ()
 {
-  return specs_p_->get_molecule (paper_l (), dir_).extent ().y ();
+  Direction d =  Side_position_interface (this).get_direction ();
+  Molecule m (get_molecule(d));
+
+  /*
+    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::do_brew_molecule_p () const
 {
-  Real dx =0.;
-
-  Molecule*mol_p = new Molecule (specs_p_->get_molecule (paper_l (), dir_));
-  /*
-    ugh, staccato dots are not centred between stafflines (how?)?
-  */
-  Real correct =0.0;
-  if (axis_ == Y_AXIS){
-    dx =  paper_l ()->note_width ()/2;
-    correct = - (Real)dir_ * 2.0 * paper_l ()->rule_thickness ();
-    mol_p->translate_axis (dx, X_AXIS);        // FIXME! ugh
-  }
+  Direction dir = DOWN;
+  SCM d = get_elt_property ("direction");
+  if (isdir_b (d))
+    dir = to_dir (d);
   
-  mol_p->translate_axis (coordinate_offset_f_ + correct, axis_);
-
-  return mol_p;
+  return new Molecule (get_molecule (dir));
 }
 
 
 
-
-int
-Script::compare (Script  *const&l1, Script *const&l2)
-{
-  return l1->specs_p_->priority_i() - l2->specs_p_->priority_i ();
-}
-
-Script::~Script ()
-{
-  delete specs_p_;
-}
- 
-Script::Script (Script const&s)
-  : Item (s), Staff_side(s)
-{
-  specs_p_ = s.specs_p_ ? s.specs_p_->clone (): 0;
-  stem_l_ =s.stem_l_;
-}
-