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

diff --git a/lily/script.cc b/lily/script.cc
index e27086c40d..a63c1d2011 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,115 +1,115 @@
-/*
-  script.cc -- implement Script
-
+/*   
+  script.cc --  implement Script_interface
+  
   source file of the GNU LilyPond music typesetter
+  
+  (c) 1999--2004 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 "directional-element-interface.hh"
+#include "warn.hh"
 #include "script.hh"
-#include "stem.hh"
-#include "molecule.hh"
+#include "font-interface.hh"
+#include "side-position-interface.hh"
+#include "paper-def.hh"
+#include "item.hh"
+#include "stencil.hh"
 #include "lookup.hh"
+#include "stem.hh"
+#include "note-column.hh"
 
-void
-Script::do_print() const
+Stencil
+Script_interface::get_stencil (Grob * me, Direction d)
 {
-#ifndef NPRINT
-  specs_l_->print();
-#endif
-}
+  SCM s = me->get_property ("script-stencil");
+  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 = ly_car (s);
+  if (key == ly_symbol2scm ("feta"))
     {
-	stem_l_ = n ? (Stem*)n->item() : 0;
+      SCM name_entry = ly_cdr (s);
+
+      SCM str = (gh_pair_p (name_entry)) ? index_get_cell (name_entry, d) :  name_entry;
+      return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
+								  ly_scm2string (str));
     }
-}
+ else if (key == ly_symbol2scm ("accordion"))
+    {
+      return Lookup::accordion (ly_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 Stencil ();
 }
 
+MAKE_SCHEME_CALLBACK (Script_interface,before_line_breaking,1);
+SCM
+Script_interface::before_line_breaking (SCM smob)
+{
+  Grob * me = unsmob_grob (smob);
 
-Script::Script()
-{    
-  specs_l_ = 0;
-  inside_staff_b_ = false;
-  stem_l_ = 0;
-  dir_i_ =  0;
-}
+  Direction d = Side_position_interface::get_direction (me);
 
-void
-Script::set_default_dir()
-{
-  int s_i=specs_l_->rel_stem_dir_i();
-  if (s_i) 
+  if (!d)
     {
-	if (stem_l_)
-	    dir_i_ = stem_l_->dir_i_ * s_i;
-	else
-	  {
-	    specs_l_->warning ("Script needs stem direction");
-	    dir_i_ = -1;
-	  }
+      /*
+	we should not have `arbitrary' directions. 
+      */
+      programming_error ("Script direction not yet known!");
+      d = DOWN;
     }
-  else 
+  
+  set_grob_direction (me, d);
+
+  if (Grob * par = me->get_parent (X_AXIS))
     {
-	dir_i_ =specs_l_->staff_dir_i();
+      Grob * stem = Note_column::get_stem (par);
+      if (stem && Stem::first_head (stem))
+	{
+	  me->set_parent (Stem::first_head (stem), X_AXIS);
+	}
     }
-  assert (dir_i_);
+  
+  return SCM_UNSPECIFIED;
 }
 
 
-Interval
-Script::do_width() const
-{
-  return specs_l_->get_atom (paper(), dir_i_).extent ().x ();
-}
+MAKE_SCHEME_CALLBACK (Script_interface,print,1);
 
-void
-Script::do_pre_processing()
+SCM
+Script_interface::print (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_ = empty_b_ = true;
+      programming_error ("Script direction not known, but stencil wanted.");
+      dir= DOWN;
     }
   
-  if (!dir_i_)
-	set_default_dir();
-  inside_staff_b_ = specs_l_->inside_b();
+  return get_stencil (me, dir).smobbed_copy ();
 }
 
-Interval
-Script::symbol_height()const
+
+
+struct Text_script
 {
-  return specs_l_->get_atom (paper(), dir_i_).extent ().y ();
-}
+    static bool has_interface (Grob*);
+};
 
-Molecule*
-Script::brew_molecule_p() const
+struct Skript
 {
-  Real dy = paper()->internote_f ();
-  
-  Molecule*out = new Molecule (specs_l_->get_atom (paper(), dir_i_));
-  out->translate (dy * pos_i_, Y_AXIS);
-  return out;
-}
+    static bool has_interface (Grob*);
+};
 
+ADD_INTERFACE (Text_script,"text-script-interface",
+  "An object that is put above or below a note",
+  "script-priority");
 
-IMPLEMENT_IS_TYPE_B2(Script,Item,Staff_side);
+ADD_INTERFACE (Script_interface, "script-interface",
+  "An object that is put above or below a note",
+  "script-priority script-stencil");
 
-int 
-Script::compare (Script  *const&l1, Script *const&l2) 
-{
-  return l1->specs_l_->priority_i() - l2->specs_l_->priority_i ();
-}
-