X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=cc5db9d7482c1952807dd8cdf10ae2ff7eb4f5c3;hb=d26be70e8f3942df6f13e25a7f79321b9b98d1a8;hp=e27086c40d5702679572037b5892c81815beafc4;hpb=13e79c0250d34b6bdfbafbc551ef64e8b59b2991;p=lilypond.git

diff --git a/lily/script.cc b/lily/script.cc
index e27086c40d..cc5db9d748 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,115 +1,70 @@
-/*
-  script.cc -- implement Script
-
+/*   
+  script.cc --  implement Script
+  
   source file of the GNU LilyPond music typesetter
+  
+  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
 
-  (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 "side-position-interface.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)
-{
-  Staff_side::do_substitute_dependency (o,n);
-  if (o == stem_l_) 
-    {
-	stem_l_ = n ? (Stem*)n->item() : 0;
-    }
-}
 
-void
-Script::set_stem (Stem*st_l)
+Molecule
+Script::get_molecule(Direction d) const
 {
-  stem_l_ = st_l;
-  add_support (st_l);
-}
-
-
-Script::Script()
-{    
-  specs_l_ = 0;
-  inside_staff_b_ = false;
-  stem_l_ = 0;
-  dir_i_ =  0;
-}
+  SCM s = get_elt_property ("molecule");
+  assert (s != SCM_UNDEFINED);
 
-void
-Script::set_default_dir()
-{
-  int s_i=specs_l_->rel_stem_dir_i();
-  if (s_i) 
+  SCM key = SCM_CAR (s);
+  if (key == ly_symbol2scm ("feta"))
     {
-	if (stem_l_)
-	    dir_i_ = stem_l_->dir_i_ * s_i;
-	else
-	  {
-	    specs_l_->warning ("Script needs stem direction");
-	    dir_i_ = -1;
-	  }
+      return lookup_l ()->afm_find ("scripts-" +
+				    ly_scm2string (index_cell (gh_cdr (s), d)));
     }
-  else 
+  else if (key == ly_symbol2scm ("accordion"))
     {
-	dir_i_ =specs_l_->staff_dir_i();
+      return lookup_l ()->accordion (s, paper_l()->get_var("interline"));
     }
-  assert (dir_i_);
-}
 
+  else assert (false);
 
-Interval
-Script::do_width() const
-{
-  return specs_l_->get_atom (paper(), dir_i_).extent ().x ();
+  return Molecule ();
 }
 
+
 void
-Script::do_pre_processing()
+Script::do_pre_processing ()
 {
-  if  (breakable_b_ && break_status_i() != 1) 
-    {
-	transparent_b_ = empty_b_ = true;
-    }
-  
-  if (!dir_i_)
-	set_default_dir();
-  inside_staff_b_ = specs_l_->inside_b();
+  /*
+    center my self on the note head.
+   */
+  Score_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_l_->get_atom (paper(), dir_i_).extent ().y ();
+  Direction d =  Side_position_interface (this).get_direction ();
+  Molecule m (get_molecule(d));
 }
 
 Molecule*
-Script::brew_molecule_p() const
+Script::do_brew_molecule_p () const
 {
-  Real dy = paper()->internote_f ();
+  Direction dir = DOWN;
+  SCM d = get_elt_property ("direction");
+  if (isdir_b (d))
+    dir = to_dir (d);
   
-  Molecule*out = new Molecule (specs_l_->get_atom (paper(), dir_i_));
-  out->translate (dy * pos_i_, Y_AXIS);
-  return out;
+  return new Molecule (get_molecule (dir));
 }
 
 
-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 ();
-}
-