X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=72d022130980d65d8d2ccb7b1a4fc676d6472df0;hb=21085be16bbb0fc1914210b69476c4f0a3ec92ea;hp=6ed6ee306c1c9ae8405631556cca1d67cf6baab0;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/script.cc b/lily/script.cc
index 6ed6ee306c..72d0221309 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,13 +1,13 @@
 /*   
-  script.cc --  implement Script
+  script.cc --  implement Script_interface
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "debug.hh"
+#include "warn.hh"
 #include "script.hh"
 #include "font-interface.hh"
 #include "side-position-interface.hh"
@@ -15,22 +15,27 @@
 #include "item.hh"
 #include "molecule.hh"
 #include "lookup.hh"
+#include "stem.hh"
+#include "note-column.hh"
 
 Molecule
-Script::get_molecule(Grob * me, Direction d)
+Script_interface::get_molecule (Grob * me, Direction d)
 {
-  SCM s = me->get_grob_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"))
     {
+      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 (index_cell (gh_cdr (s), d)));
+								  ly_scm2string (str));
     }
-  else if (key == ly_symbol2scm ("accordion"))
+ else if (key == ly_symbol2scm ("accordion"))
     {
-      return Lookup::accordion (gh_cdr (s), 1.0, Font_interface::get_default_font (me));
+      return Lookup::accordion (ly_cdr (s), 1.0, Font_interface::get_default_font (me));
     }
   else
     assert (false);
@@ -38,42 +43,72 @@ Script::get_molecule(Grob * me, Direction d)
   return Molecule ();
 }
 
-MAKE_SCHEME_CALLBACK(Script,after_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Script_interface,before_line_breaking,1);
 SCM
-Script::after_line_breaking (SCM smob)
+Script_interface::before_line_breaking (SCM smob)
 {
   Grob * me = unsmob_grob (smob);
 
-  Direction d = Side_position::get_direction (me);
-  Side_position::set_direction (me,d);
+  Direction d = Side_position_interface::get_direction (me);
+
+  if (!d)
+    {
+      /*
+	we should not have `arbitrary' directions. 
+      */
+      programming_error ("Script direction not yet known!");
+      d = DOWN;
+    }
+  
+  Side_position_interface::set_direction (me,d);
 
+  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);
+	}
+    }
+  
   return SCM_UNSPECIFIED;
 }
 
-MAKE_SCHEME_CALLBACK(Script,brew_molecule,1);
+
+MAKE_SCHEME_CALLBACK (Script_interface,brew_molecule,1);
 
 SCM
-Script::brew_molecule (SCM smob)
+Script_interface::brew_molecule (SCM smob)
 {
   Grob *me= unsmob_grob (smob);
-#if 0
-   Direction dir = DOWN;
-   SCM d = me->get_grob_property ("direction");
-   if (isdir_b (d))
-     dir = to_dir (d);
-#endif
-  Direction dir = Side_position::get_direction(me);
-  return get_molecule (me, dir).smobbed_copy();
+
+  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 ();
 }
 
-bool
-Script::has_interface (Grob*me)
+
+
+struct Text_script
 {
-  return me->has_interface (ly_symbol2scm ("script-interface"));
-}
+    static bool has_interface (Grob*);
+};
 
-void
-Script::set_interface (Grob*me)
+struct Skript
 {
-  return me->set_interface (ly_symbol2scm ("script-interface"));
-}
+    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");
+