X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=7a8630dd7c0485de154cc68bcd4cd5f9d4931a33;hb=839133759fa353574cf9323ad9da4b39d5b4eb34;hp=c74afdb1fb45341848d861a2aaf4b1f9467e08d3;hpb=90d3ec050c58d6fa91f668dd6ca1ae8f16df20c3;p=lilypond.git

diff --git a/lily/script.cc b/lily/script.cc
index c74afdb1fb..7a8630dd7c 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,105 +1,111 @@
-/*
-  script.cc -- implement Script
-
+/*   
+  script.cc --  implement Script_interface
+  
   source file of the GNU LilyPond music typesetter
+  
+  (c) 1999--2002 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 "warn.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"
+#include "stem.hh"
+#include "note-column.hh"
 
-void
-Script::do_print() const
+Molecule
+Script_interface::get_molecule (Grob * me, Direction d)
 {
-#ifndef NPRINT
-    specs_l_->print();
-#endif
-}
+  SCM s = me->get_grob_property ("script-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_) {
-	stem_l_ = n ? (Stem*)n->item() : 0;
+  SCM key = ly_car (s);
+  if (key == ly_symbol2scm ("feta"))
+    {
+      return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
+				    ly_scm2string (index_get_cell (ly_cdr (s), d)));
+    }
+  else if (key == ly_symbol2scm ("accordion"))
+    {
+      return Lookup::accordion (ly_cdr (s), 1.0, Font_interface::get_default_font (me));
     }
+  else
+    assert (false);
+
+  return Molecule ();
 }
 
-void
-Script::set_stem(Stem*st_l)
+MAKE_SCHEME_CALLBACK (Script_interface,before_line_breaking,1);
+SCM
+Script_interface::before_line_breaking (SCM smob)
 {
-    stem_l_ = st_l;
-    add_support(st_l);
-}
+  Grob * me = unsmob_grob (smob);
 
+  Direction d = Side_position_interface::get_direction (me);
 
-Script::Script()
-{    
-    specs_l_ = 0;
-    inside_staff_b_ = false;
-    stem_l_ = 0;
-    dir_i_ =  0;
-}
+  if (!d)
+    {
+      /*
+	we should not have `arbitrary' directions. 
+      */
+      programming_error ("Script direction not yet known!");
+      d = DOWN;
+    }
+  
+  Side_position_interface::set_direction (me,d);
 
-void
-Script::set_default_dir()
-{
-    int s_i=specs_l_->rel_stem_dir_i();
-    if (s_i) { 
-	if(stem_l_)
-	    dir_i_ = stem_l_->dir_i_ * s_i;
-	else{ 
-	    specs_l_->warning("Script needs stem direction");
-	    dir_i_ = -1;
+  if (Grob * par = me->get_parent (X_AXIS))
+    {
+      Grob * stem = Note_column::get_stem (par);
+      if (stem && Stem::first_head (stem))
+	{
+	  me->set_parent (Stem::first_head (stem), X_AXIS);
 	}
-    } else {
-	dir_i_ =specs_l_->staff_dir_i();
     }
-    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,brew_molecule,1);
 
-void
-Script::do_pre_processing()
+SCM
+Script_interface::brew_molecule (SCM smob)
 {
-    if (!dir_i_)
-	set_default_dir();
-    inside_staff_b_ = specs_l_->inside_b();
+  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 ();
 }
 
-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_y(dy * pos_i_);
-    return out;
-}
+    static bool has_interface (Grob*);
+};
 
-IMPLEMENT_STATIC_NAME(Script);
-IMPLEMENT_IS_TYPE_B2(Script,Item,Staff_side);
+ADD_INTERFACE (Text_script,"text-script-interface",
+  "Any text script",
+  "script-priority");
+
+ADD_INTERFACE (Script_interface, "script-interface",
+  "",
+  "script-priority script-molecule staff-support");
 
-int 
-Script::compare(Script  *const&l1, Script *const&l2) 
-{
-    return l1->specs_l_->priority_i() - l2->specs_l_->priority_i();
-}
-