source file of the GNU LilyPond music typesetter
- (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <ctype.h>
-#include "bar.hh"
-#include "command-request.hh"
+#include "bar-line.hh"
+
#include "staff-symbol.hh"
#include "engraver-group-engraver.hh"
#include "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"
#include "group-interface.hh"
+#include "text-item.hh"
/**
put stuff over or next to bars. Examples: bar numbers, marginal notes,
class Mark_engraver : public Engraver
{
public:
- VIRTUAL_COPY_CONS(Translator);
- Mark_engraver ();
+ TRANSLATOR_DECLARATIONS(Mark_engraver);
protected:
- Item* text_p_;
+ Item* text_;
protected:
virtual void stop_translation_timestep ();
virtual void acknowledge_grob (Grob_info);
- void create_items(Request*);
- virtual bool try_music (Music *req_l);
+ void create_items (Music*);
+ virtual bool try_music (Music *req);
virtual void start_translation_timestep ();
- virtual void initialize ();
virtual void process_music ();
private:
- Mark_req * mark_req_l_;
+ Music * mark_req_;
};
-ADD_THIS_TRANSLATOR (Mark_engraver);
-Mark_engraver::Mark_engraver ()
-{
- text_p_ =0;
- mark_req_l_ = 0;
-}
-void
-Mark_engraver::initialize ()
+Mark_engraver::Mark_engraver ()
{
- daddy_trans_l_->set_property ("staffsFound", SCM_EOL); // ugh: sharing with barnumber grav.
+ text_ =0;
+ mark_req_ = 0;
}
-
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_;
+ if (text_ && Bar_line::has_interface (s))
{
/*
- Ugh. Figure out how to do this right at beginning of line, (without
- creating class Bar_script : public Item).
+ TODO: make this configurable. RehearsalMark cannot be
+ break-aligned, since the width of the object should not be taken
+ into alignment considerations.
*/
- text_p_->set_parent (s, X_AXIS);
+ text_->set_parent (s, X_AXIS);
}
}
void
Mark_engraver::stop_translation_timestep ()
{
- if (text_p_)
+ if (text_)
{
- text_p_->set_grob_property("side-support-elements" , get_property ("staffsFound"));
- typeset_grob (text_p_);
- text_p_ =0;
+ text_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
+ typeset_grob (text_);
+ text_ =0;
}
}
void
-Mark_engraver::create_items (Request *rq)
+Mark_engraver::create_items (Music *rq)
{
- if (text_p_)
+ if (text_)
return;
- SCM s = get_property ("RehearsalMark");
- text_p_ = new Item (s);
-
-
- Side_position_interface::set_axis (text_p_, Y_AXIS);
-
- announce_grob (text_p_, rq);
+ text_ = new Item (get_property ("RehearsalMark"));
+ announce_grob(text_, rq->self_scm());
}
void
Mark_engraver::start_translation_timestep ()
{
- mark_req_l_ = 0;
+ mark_req_ = 0;
}
bool
-Mark_engraver::try_music (Music* r_l)
+Mark_engraver::try_music (Music* r)
{
- if (Mark_req *mr = dynamic_cast <Mark_req *> (r_l))
- {
- if (mark_req_l_ && mr->equal_b (mark_req_l_))
- return true;
- if (mark_req_l_)
- return false;
- mark_req_l_ = mr;
- return true;
- }
- return false;
+ mark_req_ = r;
+ return true;
}
void
Mark_engraver::process_music ()
{
- if (mark_req_l_)
+ if (mark_req_)
{
- create_items (mark_req_l_);
-
- String t;
+ create_items (mark_req_);
/*
automatic marks.
*/
- SCM m = mark_req_l_->get_mus_property ("label");
- if (gh_pair_p (m)) // markup text
- text_p_->set_grob_property ("text",m);
+ SCM m = mark_req_->get_mus_property ("label");
+ if (Text_item::markup_p (m))
+ {
+ text_->set_grob_property ("text",m);
+ }
else
{
- if (!gh_string_p (m))
+ String t ;
+
+ if (!gh_string_p (m) && !gh_number_p (m))
m = get_property ("rehearsalMark");
- ;
if (gh_number_p (m))
{
int mark_count = gh_scm2int (m);
- t = to_str (mark_count);
+ t = to_string (mark_count);
mark_count ++;
m = gh_int2scm (mark_count);
}
{
t = ly_scm2string (m);
String next;
- if (t.length_i ())
+ if (t.length ())
{
char c = t[0];
c++;
- next = to_str (c);
+ t = to_string (c);
}
- m = ly_str02scm (next.ch_C());
+ m = scm_makfrom0str (t.to_str0 ());
}
else
{
m = gh_int2scm (1);
+ t = to_string (1);
}
- daddy_trans_l_->set_property ("rehearsalMark", m);
-
- text_p_->set_grob_property ("text",
- ly_str02scm ( t.ch_C()));
+ text_->set_grob_property ("text",
+ scm_makfrom0str (t.to_str0 ()));
- String style = "mark";
- for (int i=0; i < t.length_i(); i++)
+ SCM series = SCM_EOL;
+ SCM family = ly_symbol2scm ("number");
+ for (int i=0; i < t.length (); i++)
{
- if (!isdigit(t[i]))
+ if (!isdigit (t[i]))
{
- style = "large";
+ /*
+ This looks strange, since \mark "A"
+ isn't printed in bold.
+
+ */
+
+ // series = ly_symbol2scm ("bold");
+ family = ly_symbol2scm ("roman");
break;
}
}
- SCM st = ly_symbol2scm (style.ch_C());
- text_p_->set_grob_property ("font-style", st);
+ if (gh_symbol_p (series))
+ text_->set_grob_property ("font-series", series);
+ if (gh_symbol_p (family))
+ text_->set_grob_property ("font-family", family);
}
+ daddy_trans_->set_property ("rehearsalMark", m);
}
}
+ENTER_DESCRIPTION(Mark_engraver,
+/* descr */ "",
+/* creats*/ "RehearsalMark",
+/* accepts */ "mark-event",
+/* acks */ "bar-line-interface",
+/* reads */ "rehearsalMark stavesFound",
+/* write */ "");
projects / lilypond.git / blobdiff