X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=2a43afc1340f8a26b171985080eb492529c63327;hb=0c1ce854cfb2b9ad594526e359ec206fdd9b21fe;hp=4e57c3ddf5297f4df21dc9db07622e051edc4b35;hpb=dccb52c3a040eb61328bf7bb9aae9a90b59e1120;p=lilypond.git

diff --git a/lily/script.cc b/lily/script.cc
index 4e57c3ddf5..2a43afc134 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,114 +1,92 @@
-/*
-  script.cc -- implement Script
-
+/*   
+  script.cc --  implement Script
+  
   source file of the GNU LilyPond music typesetter
+  
+  (c) 1999--2001 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 "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_l_->print();
-#endif
-}
+  SCM s = me->get_grob_property ("molecule");
+  assert (gh_pair_p (s));
 
-void
-Script::do_substitute_dependency (Score_elem*o,Score_elem*n)
-{
-  Staff_side::do_substitute_dependency (o,n);
-  if (o == stem_l_)
+  SCM key = gh_car (s);
+  if (key == ly_symbol2scm ("feta"))
     {
-      stem_l_ = n ? (Stem*)n->item() : 0;
+      return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
+				    ly_scm2string (index_cell (gh_cdr (s), d)));
     }
-}
+  else if (key == ly_symbol2scm ("accordion"))
+    {
+      return Lookup::accordion (gh_cdr (s), 1.0, Font_interface::get_default_font (me));
+    }
+  else
+    assert (false);
 
-void
-Script::set_stem (Stem*st_l)
-{
-  stem_l_ = st_l;
-  add_support (st_l);
+  return Molecule ();
 }
 
-
-Script::Script()
+MAKE_SCHEME_CALLBACK (Script,before_line_breaking,1);
+SCM
+Script::before_line_breaking (SCM smob)
 {
-  specs_l_ = 0;
-  stem_l_ = 0;
-  dir_ =  CENTER;
-}
+  Grob * me = unsmob_grob (smob);
 
-void
-Script::set_default_dir()
-{
-  int s_i=specs_l_->rel_stem_dir();
-  if (s_i)
-    {
-      if (stem_l_)
-	dir_ = Direction(stem_l_->dir_ * s_i);
-      else
-	{
-	  specs_l_->warning (_("Script needs stem direction"));
-	  dir_ = DOWN;
-	}
-    }
-  else
+  Direction d = Side_position_interface::get_direction (me);
+
+  if (!d)
     {
-      dir_ =specs_l_->staff_dir();
+  /*
+    we should not have `arbitrary' directions. 
+   */
+      programming_error ("Script direction not yet known!");
+      d = DOWN;
     }
-  assert (dir_);
+  
+  Side_position_interface::set_direction (me,d);
+
+  return SCM_UNSPECIFIED;
 }
 
 
-Interval
-Script::do_width() const
-{
-  return specs_l_->get_atom (paper(), dir_).extent ().x ();
-}
+MAKE_SCHEME_CALLBACK (Script,brew_molecule,1);
 
-void
-Script::do_pre_processing()
+SCM
+Script::brew_molecule (SCM smob)
 {
-  if  (breakable_b_ && break_status_i() != 1)
+  Grob *me= unsmob_grob (smob);
+
+  Direction dir = Side_position_interface::get_direction (me);
+  if (!dir)
     {
-      transparent_b_ = true;
-      set_empty (true);
+      programming_error ("Script direction not known, but molecule wanted.");
+      dir= DOWN;
     }
-
-  if (!dir_)
-    set_default_dir();
+  
+  return get_molecule (me, dir).smobbed_copy ();
 }
 
-Interval
-Script::symbol_height() const
+bool
+Script::has_interface (Grob*me)
 {
-  return specs_l_->get_atom (paper(), dir_).extent ().y ();
+  return me->has_interface (ly_symbol2scm ("script-interface"));
 }
 
-Molecule*
-Script::brew_molecule_p() const
+void
+Script::set_interface (Grob*me)
 {
-  Real dx = paper()->note_width()/2;
-
-  Molecule*out = new Molecule (specs_l_->get_atom (paper(), dir_));
-  out->translate_axis (y_, Y_AXIS);
-  out->translate_axis (dx, X_AXIS);	// FIXME! ugh
-  return out;
+  return me->set_interface (ly_symbol2scm ("script-interface"));
 }
 
-
-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 ();
-}