X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdirectional-element-interface.cc;h=4c46118b1f05493c7ac94bce637106598a147d69;hb=5383cafcc75ae088f833df0081e2b2a73a5442a1;hp=dec6d49ce3a52dde394cc5495dc21097d8a713d3;hpb=1753b1a73742a5b0893037116bb6f2febba277f3;p=lilypond.git diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc index dec6d49ce3..4c46118b1f 100644 --- a/lily/directional-element-interface.cc +++ b/lily/directional-element-interface.cc @@ -1,42 +1,32 @@ -/* - directional-element.cc -- implement Directional_element - - source file of the GNU LilyPond music typesetter - - (c) 1999--2003 Han-Wen Nienhuys - - */ - -#include "directional-element-interface.hh" - +/* + directional-element-interface.cc -- implement Directional_element + source file of the GNU LilyPond music typesetter + (c) 1999--2006 Han-Wen Nienhuys +*/ -bool -Directional_element_interface::has_interface (Grob*me) -{ - return is_direction (me->get_grob_property ("direction")); -} +#include "directional-element-interface.hh" +#include "warn.hh" Direction -Directional_element_interface::get (Grob*me) +get_grob_direction (Grob *me) { - // return dir_; - SCM d= me->get_grob_property ("direction"); + 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 (Grob*me, Direction d) +set_grob_direction (Grob *me, Direction d) { - SCM sd = gh_int2scm (d); - - /* - Vain attempt to save some conses. - */ - if (me->get_grob_property ("direction") != sd) - me->set_grob_property ("direction", sd); + SCM sd = scm_from_int (d); + me->set_property ("direction", sd); }