Run `make grand-replace'.

[lilypond.git] / lily / directional-element-interface.cc

diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc
index 5ab19596a72016a6788debe62ca8c7d4f9270392..c217677606119577b77c11e43a112973233ed257 100644 (file)
--- a/lily/directional-element-interface.cc
+++ b/lily/directional-element-interface.cc
@@ -3,15 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "directional-element-interface.hh"
+#include "warn.hh"
+#include "grob.hh"
 
 Direction
 get_grob_direction (Grob *me)
 {
   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;
 
@@ -21,6 +28,6 @@ get_grob_direction (Grob *me)
 void
 set_grob_direction (Grob *me, Direction d)
 {
-  SCM sd = scm_int2num (d);
+  SCM sd = scm_from_int (d);
   me->set_property ("direction", sd);
 }