X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fdirectional-element-interface.cc;h=98ea9b53f44a90d32cc3fb2f27cd5d4d584ff74b;hb=d31f8b518f7b5f04e7c332e001b1e31c23c39021;hp=b45012c3bec2507e35b11c0015d954d5c5625e49;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git

diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc
index b45012c3be..98ea9b53f4 100644
--- a/lily/directional-element-interface.cc
+++ b/lily/directional-element-interface.cc
@@ -1,28 +1,33 @@
-/*   
+/*
   directional-element-interface.cc -- implement Directional_element
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "directional-element-interface.hh"
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
+#include "directional-element-interface.hh"
+#include "warn.hh"
+#include "grob.hh"
 
 Direction
-get_grob_direction (Grob*me) 
+get_grob_direction (Grob *me)
 {
-  SCM d= me->get_property ("direction");
+  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
-set_grob_direction (Grob*me, Direction d) 
+set_grob_direction (Grob *me, Direction d)
 {
-  SCM sd = scm_int2num (d);
+  SCM sd = scm_from_int (d);
   me->set_property ("direction", sd);
 }