X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdirectional-element-interface.cc;h=eb342fe1ac1c89a01cbe50eeb734ce97444b2edb;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=5ab19596a72016a6788debe62ca8c7d4f9270392;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc
index 5ab19596a7..eb342fe1ac 100644
--- a/lily/directional-element-interface.cc
+++ b/lily/directional-element-interface.cc
@@ -1,17 +1,36 @@
 /*
-  directional-element-interface.cc -- implement Directional_element
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "directional-element-interface.hh"
+#include "warn.hh"
+#include "grob.hh"
 
 Direction
 get_grob_direction (Grob *me)
 {
   SCM d = me->get_property ("direction");
+  if (scm_is_eq (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 +40,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);
 }