patch::: 1.3.18.jcn3

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index ebceea43abc3d8cd95eaaa0e8b1ff7e011b79159..c3dc48943d012e6670296c15216633d951573428 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,5 +1,5 @@
 /*   
-     script.cc --  implement Script
+  script.cc --  implement Script
   
   source file of the GNU LilyPond music typesetter
   
@@ -7,45 +7,27 @@
   
  */
 
-/*
-
-  TODO: Quantisation support (staccato dots between stafflines)
-
-*/
 #include "debug.hh"
 #include "script.hh"
 #include "lookup.hh"
-#include "staff-side.hh"
+#include "side-position-interface.hh"
 #include "paper-def.hh"
 #include "dimension-cache.hh"
 
-Script::Script ()
-{
-  staff_side_l_ =0;
-}
-
-void
-Script::do_substitute_element_pointer (Score_element*o, Score_element*n)
-{
-  if (o == staff_side_l_)
-    staff_side_l_ = dynamic_cast<Staff_side_item*>(n);
-}
-
-
 
 Molecule
 Script::get_molecule(Direction d) const
 {
   SCM s = get_elt_property ("molecule");
-  assert (s != SCM_UNDEFINED);
+  assert (gh_pair_p (s));
 
-  SCM key = SCM_CAR (s);
-  if (key == ly_symbol ("feta"))
+  SCM key = gh_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_symbol ("accordion"))
+  else if (key == ly_symbol2scm ("accordion"))
     {
       return lookup_l ()->accordion (s, paper_l()->get_var("interline"));
     }
@@ -62,40 +44,27 @@ Script::do_pre_processing ()
   /*
     center my self on the note head.
    */
-  Graphical_element * e = staff_side_l_->parent_l(X_AXIS);
+  Score_element * e = parent_l(X_AXIS);
   translate_axis (e->extent (X_AXIS).center (), X_AXIS);
 }
 
 void
 Script::do_post_processing ()
 {
-  Direction d =  staff_side_l_->get_direction ();
+  Direction d =  Side_position_interface (this).get_direction ();
   Molecule m (get_molecule(d));
-
-  /*
-    UGH UGH UGH
-   */
-  if (staff_side_l_->get_elt_property ("no-staff-support") == SCM_UNDEFINED) 
-    translate_axis (- m.dim_[Y_AXIS][Direction (-d)], Y_AXIS);
-}
-
-void
-Script::set_staff_side (Staff_side_item*g)
-{
-  staff_side_l_ = g;
-  add_dependency (g);
-  set_parent (g, Y_AXIS);
 }
 
 Molecule*
 Script::do_brew_molecule_p () const
 {
-  return new Molecule (get_molecule (staff_side_l_->get_direction ()));
+  Direction dir = DOWN;
+  SCM d = get_elt_property ("direction");
+  if (isdir_b (d))
+    dir = to_dir (d);
+  
+  return new Molecule (get_molecule (dir));
 }
 
-void
-Script::do_print () const
-{
 
-}