X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=7483b07a79318cdf30cac54eb54d4cdc9a52c0ff;hb=286fcad779ede8a2d08ce42842f7ae0ae1df74cb;hp=326667e7b44cc99a6d380d756d3bc11bc1922e8b;hpb=c21d49df60cb97801ab33ab8a1bad6f2c81cd820;p=lilypond.git

diff --git a/lily/script.cc b/lily/script.cc
index 326667e7b4..7483b07a79 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,84 +1,111 @@
 /*   
-  script.cc --  implement Script
+  script.cc --  implement Script_interface
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "debug.hh"
 #include "script.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
 #include "side-position-interface.hh"
 #include "paper-def.hh"
-#include "dimension-cache.hh"
-
-Script ::Script (SCM s)
-  : Item (s)
-{
-}
+#include "item.hh"
+#include "molecule.hh"
+#include "lookup.hh"
+#include "stem.hh"
+#include "note-column.hh"
 
 Molecule
-Script::get_molecule(Direction d) const
+Script_interface::get_molecule (Grob * me, Direction d)
 {
-  SCM s = get_elt_property ("molecule");
+  SCM s = me->get_grob_property ("script-molecule");
   assert (gh_pair_p (s));
 
-  SCM key = gh_car  (s);
+  SCM key = ly_car (s);
   if (key == ly_symbol2scm ("feta"))
     {
-      return lookup_l ()->afm_find ("scripts-" +
-				    ly_scm2string (index_cell (gh_cdr (s), d)));
+      return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
+				    ly_scm2string (index_cell (ly_cdr (s), d)));
     }
   else if (key == ly_symbol2scm ("accordion"))
     {
-      return lookup_l ()->accordion (gh_cdr (s), paper_l()->get_var("interline"));
+      return Lookup::accordion (ly_cdr (s), 1.0, Font_interface::get_default_font (me));
     }
-
-  else assert (false);
+  else
+    assert (false);
 
   return Molecule ();
 }
 
-
-GLUE_SCORE_ELEMENT(Script,before_line_breaking);
+MAKE_SCHEME_CALLBACK (Script_interface,before_line_breaking,1);
 SCM
-Script::member_before_line_breaking ()
+Script_interface::before_line_breaking (SCM smob)
 {
-  /*
-    center my self on the note head.
-   */
-  Score_element * e = parent_l(X_AXIS);
-  translate_axis (e->extent (X_AXIS).center (), X_AXIS);
+  Grob * me = unsmob_grob (smob);
 
-  return SCM_UNDEFINED;
-}
+  Direction d = Side_position_interface::get_direction (me);
 
-GLUE_SCORE_ELEMENT(Script,after_line_breaking);
-SCM
-Script::member_after_line_breaking ()
-{
-  Side_position_interface i (this);
-  Direction d =  i.get_direction ();
-  i.set_direction (d);
+  if (!d)
+    {
+      /*
+	we should not have `arbitrary' directions. 
+      */
+      programming_error ("Script direction not yet known!");
+      d = DOWN;
+    }
+  
+  Side_position_interface::set_direction (me,d);
 
-  return SCM_UNDEFINED;
+  if (Grob * par = me->get_parent (X_AXIS))
+    {
+      Grob * stem = Note_column::stem_l (par);
+      if (stem && Stem::first_head (stem))
+	{
+	  me->set_parent (Stem::first_head (stem), X_AXIS);
+	}
+    }
+  
+  return SCM_UNSPECIFIED;
 }
 
 
-GLUE_SCORE_ELEMENT(Script,brew_molecule);
+MAKE_SCHEME_CALLBACK (Script_interface,brew_molecule,1);
 
 SCM
-Script::member_brew_molecule () const
+Script_interface::brew_molecule (SCM smob)
 {
-  Direction dir = DOWN;
-  SCM d = get_elt_property ("direction");
-  if (isdir_b (d))
-    dir = to_dir (d);
+  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 (dir).create_scheme();
+  return get_molecule (me, dir).smobbed_copy ();
 }
 
 
 
+struct Text_script
+{
+    static bool has_interface (Grob*);
+};
+
+struct Skript
+{
+    static bool has_interface (Grob*);
+};
+
+ADD_INTERFACE (Text_script,"text-script-interface",
+  "Any text script",
+  "script-priority");
+
+ADD_INTERFACE (Script_interface, "script-interface",
+  "",
+  "script-priority script-molecule staff-support");
+