release: 1.3.4

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 984d20063aea6d5764f70d23505e284e2e907db8..ebceea43abc3d8cd95eaaa0e8b1ff7e011b79159 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,5 +1,5 @@
 /*   
-  g-script.cc --  implement Script
+     script.cc --  implement Script
   
   source file of the GNU LilyPond music typesetter
   
@@ -17,6 +17,7 @@
 #include "lookup.hh"
 #include "staff-side.hh"
 #include "paper-def.hh"
+#include "dimension-cache.hh"
 
 Script::Script ()
 {
@@ -35,19 +36,18 @@ Script::do_substitute_element_pointer (Score_element*o, Score_element*n)
 Molecule
 Script::get_molecule(Direction d) const
 {
-  SCM s = get_elt_property (molecule_scm_sym);
-  assert  (s != SCM_BOOL_F);
+  SCM s = get_elt_property ("molecule");
+  assert (s != SCM_UNDEFINED);
 
-  s = SCM_CDR(s);
   SCM key = SCM_CAR (s);
   if (key == ly_symbol ("feta"))
     {
       return lookup_l ()->afm_find ("scripts-" +
-                                   ly_scm2string (index_cell (SCM_CDR (s), d)));
+                                   ly_scm2string (index_cell (gh_cdr (s), d)));
     }
   else if (key == ly_symbol ("accordion"))
     {
-      return lookup_l ()->accordion (SCM_CDR(s), paper_l()->get_realvar(interline_scm_sym));
+      return lookup_l ()->accordion (s, paper_l()->get_var("interline"));
     }
 
   else assert (false);
@@ -59,17 +59,24 @@ Script::get_molecule(Direction d) const
 void
 Script::do_pre_processing ()
 {
-  Graphical_element * e
-    = staff_side_l_->dim_cache_[X_AXIS]->parent_l_->element_l();
+  /*
+    center my self on the note head.
+   */
+  Graphical_element * e = staff_side_l_->parent_l(X_AXIS);
   translate_axis (e->extent (X_AXIS).center (), X_AXIS);
 }
 
 void
 Script::do_post_processing ()
 {
-  Direction d =  staff_side_l_->dir_;
+  Direction d =  staff_side_l_->get_direction ();
   Molecule m (get_molecule(d));
-  translate_axis (- m.dim_[Y_AXIS][Direction (-d)], Y_AXIS);
+
+  /*
+    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
@@ -77,13 +84,13 @@ Script::set_staff_side (Staff_side_item*g)
 {
   staff_side_l_ = g;
   add_dependency (g);
-  dim_cache_[Y_AXIS]->parent_l_ = g->dim_cache_[Y_AXIS];
+  set_parent (g, Y_AXIS);
 }
 
 Molecule*
 Script::do_brew_molecule_p () const
 {
-  return new Molecule (get_molecule (staff_side_l_->dir_));
+  return new Molecule (get_molecule (staff_side_l_->get_direction ()));
 }
 
 void
@@ -91,3 +98,4 @@ Script::do_print () const
 {
 
 }
+