X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdirectional-element-interface.cc;h=eb342fe1ac1c89a01cbe50eeb734ce97444b2edb;hb=4690bfaa07a15e38ebfd1299fa209968603f3630;hp=e34eea308ad05731d36beaf7eda4d6097d902c51;hpb=b638d530ac5a32a832646cdd2b680ce52d0764f0;p=lilypond.git

diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc
index e34eea308a..eb342fe1ac 100644
--- a/lily/directional-element-interface.cc
+++ b/lily/directional-element-interface.cc
@@ -1,42 +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>
-  
- */
-
-#include "directional-element-interface.hh"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-Directional_element_interface::Directional_element_interface (Score_element const *s)
-{
-  elt_l_ =  (Score_element*)s;
-}
+  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.
 
-bool
-Directional_element_interface::has_interface_b () const
-{
-  return isdir_b (elt_l_->get_elt_property ("direction"));
-}
+  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
-Directional_element_interface::get () const
+get_grob_direction (Grob *me)
 {
-  // return dir_;
-  SCM d= elt_l_->get_elt_property ("direction");
-  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 (Direction d) 
+set_grob_direction (Grob *me, Direction d)
 {
-  elt_l_->set_elt_property ("direction", gh_int2scm (d));
+  SCM sd = scm_from_int (d);
+  me->set_property ("direction", sd);
 }