X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbar-engraver.cc;h=16792eac58adf2306e2b295e61f8b94e2cf250db;hb=715153c6137c0a16a1e08ffe03e6937f03c1bf3f;hp=996f02bfe9ffc5e75faa465001da6a9159a09213;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 996f02bfe9..16792eac58 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -3,11 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include "bar-line.hh" +#include "context.hh" #include "score-engraver.hh" #include "warn.hh" #include "item.hh" @@ -21,7 +22,7 @@ class Bar_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Bar_engraver); - void request_bar (String type_string); + void request_bar (string type_string); protected: virtual void finalize (); @@ -89,16 +90,15 @@ void Bar_engraver::stop_translation_timestep () { if (!bar_) - /* guh. Use properties! */ - get_score_engraver ()->forbid_breaks (); + context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T); else typeset_bar (); } ADD_TRANSLATOR (Bar_engraver, - /* descr */ "Create barlines. This engraver is controlled through the " + /* doc */ "Create barlines. This engraver is controlled through the " "@code{whichBar} property. If it has no bar line to create, it will forbid a linebreak at this point", - /* creats*/ "BarLine", - /* accepts */ "", - /* reads */ "whichBar", - /* write */ ""); + /* create */ "BarLine", + /* accept */ "", + /* read */ "whichBar", + /* write */ "forbidBreak");