X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdirectional-element-interface.cc;h=fdfe6d13419b49db9045c485320244a9cf54714f;hb=f096d340dfc203d6549a9d042d78de2dfae4cc3c;hp=e34eea308ad05731d36beaf7eda4d6097d902c51;hpb=b638d530ac5a32a832646cdd2b680ce52d0764f0;p=lilypond.git diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc index e34eea308a..fdfe6d1341 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_b () const -{ - return isdir_b (elt_l_->get_elt_property ("direction")); -} + source file of the GNU LilyPond music typesetter + (c) 1999--2007 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); }