X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-interface.cc;h=de8198533bb044483d7c0b79cadf54d644b15b5d;hb=ae0484ae139f4de639f91e64a3788583e5f84d87;hp=c82b30c4be4acbc7b28cd2b961929420d1c125a7;hpb=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index c82b30c4be..de8198533b 100644
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -1,15 +1,15 @@
-/*   
-  script-interface.cc --  implement Script_interface
-  
+/*
+  script-interface.cc -- implement Script_interface
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "script-interface.hh"
 
 #include "directional-element-interface.hh"
 #include "warn.hh"
-#include "script-interface.hh"
 #include "font-interface.hh"
 #include "side-position-interface.hh"
 #include "output-def.hh"
@@ -30,7 +30,7 @@ Script_interface::get_stencil (Grob *me, Direction d)
       SCM str = ((scm_is_pair (name_entry)) ? index_get_cell (name_entry, d)
 		 : name_entry);
       return Font_interface::get_default_font (me)
-	->find_by_name ("scripts-" + ly_scm2string (str));
+	->find_by_name ("scripts." + ly_scm2string (str));
     }
   else if (key == ly_symbol2scm ("accordion"))
     return Lookup::accordion (scm_cdr (s), 1.0,
@@ -41,30 +41,27 @@ Script_interface::get_stencil (Grob *me, Direction d)
   return Stencil ();
 }
 
-MAKE_SCHEME_CALLBACK (Script_interface, before_line_breaking, 1);
+MAKE_SCHEME_CALLBACK (Script_interface, calc_direction, 1);
 SCM
-Script_interface::before_line_breaking (SCM smob)
+Script_interface::calc_direction (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-
   Direction d = Side_position_interface::get_direction (me);
 
   if (!d)
     {
-      /* FIXME: This should never happen: `arbitrary' directions.  */
-      programming_error ("Script direction not yet known!");
+      me->programming_error ("script direction not yet known");
       d = DOWN;
     }
 
-  set_grob_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;
+
+  return scm_from_int (d);
 }
 
 MAKE_SCHEME_CALLBACK (Script_interface, print, 1);
@@ -74,29 +71,36 @@ Script_interface::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
-  Direction dir = Side_position_interface::get_direction (me);
-  if (!dir)
-    {
-      programming_error ("Script direction not known, but stencil wanted.");
-      dir = DOWN;
-    }
+  Direction dir = get_grob_direction (me);
+
   return get_stencil (me, dir).smobbed_copy ();
 }
 
 struct Text_script
 {
-  static bool has_interface (Grob*);
+  static bool has_interface (Grob *);
 };
 
-ADD_INTERFACE (Text_script,"text-script-interface",
-  "An object that is put above or below a note",
-  "add-stem-support slur script-priority inside-slur");
+ADD_INTERFACE (Text_script, "text-script-interface",
+	       "An object that is put above or below a note",
 
+	       /* properties */
+	       "add-stem-support "
+	       "avoid-slur "
+	       "script-priority "
+	       "slur "
+	       );
 
 /*
   Hmm. Where should we put add-stem-support ?
- */
+*/
 ADD_INTERFACE (Script_interface, "script-interface",
-  "An object that is put above or below a note",
-  "add-stem-support slur-padding slur script-priority script-stencil inside-slur");
+	       "An object that is put above or below a note",
+	       "add-stem-support "
+	       "avoid-slur "
+	       "script-priority "
+	       "script-stencil "
+	       "slur "
+	       "slur-padding "
+	       );