X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdirectional-element-interface.cc;h=98ea9b53f44a90d32cc3fb2f27cd5d4d584ff74b;hb=039bfe9e53dc94ce234b737383f54c3d0409099e;hp=4a6a9e4d11c1b6de5c470b5706fea495f5503e07;hpb=0af2486a28f1c60b9de929a9101964d880927e54;p=lilypond.git diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc index 4a6a9e4d11..98ea9b53f4 100644 --- a/lily/directional-element-interface.cc +++ b/lily/directional-element-interface.cc @@ -1,42 +1,33 @@ -/* - directional-element.cc -- implement Directional_element - - source file of the GNU LilyPond music typesetter - - (c) 1999--2000 Han-Wen Nienhuys - - */ - -#include "directional-element-interface.hh" - - -Directional_element_interface::Directional_element_interface (Score_element const *s) -{ - elt_l_ = (Score_element*)s; -} +/* + directional-element-interface.cc -- implement Directional_element -bool -Directional_element_interface::has_interface () const -{ - return isdir_b (elt_l_->get_elt_property ("direction")); -} + source file of the GNU LilyPond music typesetter + (c) 1999--2009 Han-Wen Nienhuys +*/ - +#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 (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); }