X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=44ee942f2a71775b14010fa5223d8d14379423b9;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=576a9fdb9b90af120233af7b074b818fcad6dc9e;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git

diff --git a/lily/script.cc b/lily/script.cc
index 576a9fdb9b..44ee942f2a 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,134 +1,92 @@
-/*
-  script.cc -- implement Script
-
+/*   
+  script.cc --  implement Script
+  
   source file of the GNU LilyPond music typesetter
+  
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
 
-  (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 "font-interface.hh"
+#include "side-position-interface.hh"
+#include "paper-def.hh"
+#include "item.hh"
 #include "molecule.hh"
 #include "lookup.hh"
 
-void
-Script::do_print () const
+Molecule
+Script::get_molecule (Grob * me, Direction d)
 {
-#ifndef NPRINT
-  specs_p_->print ();
-#endif
-}
+  SCM s = me->get_grob_property ("molecule");
+  assert (gh_pair_p (s));
 
-void
-Script::do_substitute_element_pointer (Score_element*o,Score_element*n)
-{
-  Staff_side::do_substitute_element_pointer (o,n);
-  if (o == stem_l_)
+  SCM key = ly_car (s);
+  if (key == ly_symbol2scm ("feta"))
     {
-      stem_l_ = dynamic_cast<Stem *> (n);
+      return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
+				    ly_scm2string (index_cell (ly_cdr (s), d)));
     }
-}
-
-void
-Script::set_stem (Stem*st_l)
-{
-  stem_l_ = st_l;
-  add_support (st_l);
-}
-
-
-Script::Script ()
-{
-  axis_ = Y_AXIS;
-  specs_p_ = 0;
-  stem_l_ = 0;
-  dir_ =  CENTER;
-}
-
-void
-Script::set_default_dir ()
-{
-  int s_i=specs_p_->rel_stem_dir ();
-  if (s_i)
+  else if (key == ly_symbol2scm ("accordion"))
     {
-      if (stem_l_)
-	dir_ = Direction (stem_l_->dir_ * s_i);
-      else
-	{
-	  specs_p_->warning (_ ("script needs stem direction"));
-	  dir_ = DOWN;
-	}
+      return Lookup::accordion (ly_cdr (s), 1.0, Font_interface::get_default_font (me));
     }
   else
-    {
-      dir_ =specs_p_->staff_dir ();
-    }
-  assert (dir_);
-}
-
+    assert (false);
 
-Interval
-Script::do_width () const
-{
-  return specs_p_->get_molecule (paper_l (), dir_).extent ().x ();
+  return Molecule ();
 }
 
-void
-Script::do_pre_processing ()
+MAKE_SCHEME_CALLBACK (Script,before_line_breaking,1);
+SCM
+Script::before_line_breaking (SCM smob)
 {
-  Staff_side::do_pre_processing ();
-  if (axis_ == Y_AXIS && !dir_)
-    set_default_dir ();
-}
+  Grob * me = unsmob_grob (smob);
 
-Interval
-Script::symbol_height () const
-{
-  return specs_p_->get_molecule (paper_l (), dir_).extent ().y ();
-}
-
-
-Molecule*
-Script::do_brew_molecule_p () const
-{
-  Real dx =0.;
+  Direction d = Side_position_interface::get_direction (me);
 
-  Molecule*mol_p = new Molecule (specs_p_->get_molecule (paper_l (), dir_));
+  if (!d)
+    {
   /*
-    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
-  }
+    we should not have `arbitrary' directions. 
+   */
+      programming_error ("Script direction not yet known!");
+      d = DOWN;
+    }
   
-  mol_p->translate_axis (coordinate_offset_f_ + correct, axis_);
+  Side_position_interface::set_direction (me,d);
 
-  return mol_p;
+  return SCM_UNSPECIFIED;
 }
 
 
+MAKE_SCHEME_CALLBACK (Script,brew_molecule,1);
 
-
-int
-Script::compare (Script  *const&l1, Script *const&l2)
+SCM
+Script::brew_molecule (SCM smob)
 {
-  return l1->specs_p_->priority_i() - l2->specs_p_->priority_i ();
+  Grob *me= unsmob_grob (smob);
+
+  Direction dir = Side_position_interface::get_direction (me);
+  if (!dir)
+    {
+      programming_error ("Script direction not known, but molecule wanted.");
+      dir= DOWN;
+    }
+  
+  return get_molecule (me, dir).smobbed_copy ();
 }
 
-Script::~Script ()
+bool
+Script::has_interface (Grob*me)
 {
-  delete specs_p_;
+  return me->has_interface (ly_symbol2scm ("script-interface"));
 }
- 
-Script::Script (Script const&s)
-  : Item (s), Staff_side(s)
+
+void
+Script::set_interface (Grob*me)
 {
-  specs_p_ = s.specs_p_ ? s.specs_p_->clone (): 0;
-  stem_l_ =s.stem_l_;
+  return me->set_interface (ly_symbol2scm ("script-interface"));
 }
-  
+