source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <ctype.h>
-#include "bar.hh"
+#include "bar-line.hh"
#include "command-request.hh"
#include "staff-symbol.hh"
#include "engraver-group-engraver.hh"
#include "lily-guile.hh"
#include "paper-column.hh"
#include "paper-def.hh"
-
#include "side-position-interface.hh"
#include "staff-symbol-referencer.hh"
#include "item.hh"
class Mark_engraver : public Engraver
{
public:
- VIRTUAL_COPY_CONS(Translator);
- Mark_engraver ();
+ TRANSLATOR_DECLARATIONS(Mark_engraver);
protected:
Item* text_p_;
protected:
virtual void stop_translation_timestep ();
virtual void acknowledge_grob (Grob_info);
- void create_items(Request*);
+ void create_items (Request*);
virtual bool try_music (Music *req_l);
virtual void start_translation_timestep ();
- virtual void initialize ();
virtual void process_music ();
private:
};
-ADD_THIS_TRANSLATOR (Mark_engraver);
+
Mark_engraver::Mark_engraver ()
mark_req_l_ = 0;
}
-void
-Mark_engraver::initialize ()
-{
- daddy_trans_l_->set_property ("staffsFound", SCM_EOL); // ugh: sharing with barnumber grav.
-}
-
-
void
Mark_engraver::acknowledge_grob (Grob_info inf)
{
- Grob * s = inf.elem_l_;
- if (Staff_symbol::has_interface (s)
- || to_boolean (s->get_grob_property ("invisible-staff")))
- {
- SCM sts = get_property ("staffsFound");
- SCM thisstaff = inf.elem_l_->self_scm ();
- if (scm_memq (thisstaff, sts) == SCM_BOOL_F)
- daddy_trans_l_->set_property ("staffsFound", gh_cons (thisstaff, sts));
- }
- else if (text_p_ && Bar::has_interface (s))
+ Grob * s = inf.grob_l_;
+ if (text_p_ && Bar_line::has_interface (s))
{
/*
Ugh. Figure out how to do this right at beginning of line, (without
{
if (text_p_)
{
- text_p_->set_grob_property("side-support-elements" , get_property ("staffsFound"));
+ text_p_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
typeset_grob (text_p_);
text_p_ =0;
}
text_p_ = new Item (s);
- Side_position::set_axis (text_p_, Y_AXIS);
-
- announce_grob (text_p_, rq);
+ announce_grob(text_p_, rq->self_scm());
}
text_p_->set_grob_property ("text",m);
else
{
- if (!gh_string_p (m))
+ if (!gh_string_p (m) && !gh_number_p (m))
m = get_property ("rehearsalMark");
- ;
if (gh_number_p (m))
{
c++;
next = to_str (c);
}
- m = ly_str02scm (next.ch_C());
+ m = ly_str02scm (next.ch_C ());
}
else
{
daddy_trans_l_->set_property ("rehearsalMark", m);
text_p_->set_grob_property ("text",
- ly_str02scm ( t.ch_C()));
+ ly_str02scm (t.ch_C ()));
- String style = "mark";
- for (int i=0; i < t.length_i(); i++)
+ String style = "mark-number";
+ for (int i=0; i < t.length_i (); i++)
{
- if (!isdigit(t[i]))
+ if (!isdigit (t[i]))
{
- style = "large";
+ style = "mark-letter";
break;
}
}
- SCM st = ly_symbol2scm (style.ch_C());
+ SCM st = ly_symbol2scm (style.ch_C ());
text_p_->set_grob_property ("font-style", st);
}
}
}
+ENTER_DESCRIPTION(Mark_engraver,
+/* descr */ "",
+/* creats*/ "RehearsalMark",
+/* acks */ "bar-line-interface",
+/* reads */ "rehearsalMark stavesFound",
+/* write */ "");