X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=b96ef69182b2ceb80abdb3e141180ca45c1db2e8;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=a849ec11ce0dddd77f57c586efc0db2c8a68a3f7;hpb=0dcde4fc13c8091439fb8e2d77ea755357a0e7ed;p=lilypond.git diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index a849ec11ce..b96ef69182 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -58,7 +58,8 @@ protected: void acknowledge_break_alignment (Grob_info); }; -Mark_engraver::Mark_engraver () +Mark_engraver::Mark_engraver (Context *c) + : Engraver (c) { text_ = 0; final_text_ = 0; @@ -145,14 +146,16 @@ Mark_engraver::process_music () m = scm_call_2 (proc, m, context ()->self_scm ()); } else - /* FIXME: constant error message. */ - warning (_ ("rehearsalMark must have integer value")); + /* Score.rehearsalMark is initialized to #1 so we + never should see this case without user error */ + mark_ev_->origin ()->warning + (_ ("rehearsalMark must have integer value")); } if (Text_interface::is_markup (m)) text_->set_property ("text", m); else - warning (_ ("mark label must be a markup object")); + mark_ev_->origin ()->warning (_ ("mark label must be a markup object")); } }