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

diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc
index 7075e2e44f..eb342fe1ac 100644
--- a/lily/directional-element-interface.cc
+++ b/lily/directional-element-interface.cc
@@ -1,47 +1,45 @@
-/*   
-  directional-element.cc -- implement Directional_element
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "directional-element-interface.hh"
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.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.
 
-SCM Directional_element_interface::direction_sym;
+  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.
 
-static void
-init_functions ()
-{
-  Directional_element_interface::direction_sym = scm_permanent_object (ly_symbol2scm ("direction"));
-}
-ADD_SCM_INIT_FUNC(Directional, init_functions);
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-
-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 (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;
-      
+
   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);
 }