X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdirectional-element-interface.cc;h=fdfe6d13419b49db9045c485320244a9cf54714f;hb=5ba2cc020588fe55567e369a980980b22976a4f6;hp=7f986d51ee1070ff2c7c15f5fd91a3640d72bb82;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc
index 7f986d51ee..fdfe6d1341 100644
--- a/lily/directional-element-interface.cc
+++ b/lily/directional-element-interface.cc
@@ -1,47 +1,33 @@
-/*   
-  directional-element.cc -- implement Directional_element
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "directional-element-interface.hh"
-
+/*
+  directional-element-interface.cc -- implement Directional_element
 
-SCM Directional_element_interface::direction_sym;
-
-static void
-init_functions ()
-{
-  Directional_element_interface::direction_sym = scm_permanent_object (ly_symbol2scm ("direction"));
-}
-ADD_SCM_INIT_FUNC (Directional, init_functions);
+  source file of the GNU LilyPond music typesetter
 
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-bool
-Directional_element_interface::has_interface (Grob*me) 
-{
-  return isdir_b (me->get_grob_property (direction_sym));
-}
+#include "directional-element-interface.hh"
+#include "warn.hh"
+#include "grob.hh"
 
 Direction
-Directional_element_interface::get (Grob*me) 
+get_grob_direction (Grob *me)
 {
-  // return dir_;
-  SCM d= me->get_grob_property (direction_sym);
-  if (!isdir_b (d))
+  SCM d = me->get_property ("direction");
+  if (d == ly_symbol2scm ("calculation-in-progress"))
+    {
+      programming_error ("Grob direction requested while calculation in progress. ");
+      return UP;
+    }
+  if (!is_direction (d))
     return CENTER;
-      
+
   return to_dir (d);
 }
 
 void
-Directional_element_interface::set (Grob*me, Direction d) 
+set_grob_direction (Grob *me, Direction d)
 {
-  SCM sd = gh_int2scm (d);
-
-  if (me->get_grob_property (direction_sym) != sd)
-    me->set_grob_property (direction_sym, sd);
+  SCM sd = scm_from_int (d);
+  me->set_property ("direction", sd);
 }