source file of the GNU LilyPond music typesetter
- (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <ctype.h>
+
#include "bar-line.hh"
-#include "command-request.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 "warn.hh"
+#include "text-item.hh"
/**
put stuff over or next to bars. Examples: bar numbers, marginal notes,
protected:
virtual void stop_translation_timestep ();
virtual void acknowledge_grob (Grob_info);
- void create_items (Request*);
- virtual bool try_music (Music *req);
- virtual void start_translation_timestep ();
+ void create_items (Music*);
+ virtual bool try_music (Music *ev);
virtual void process_music ();
private:
- Mark_req * mark_req_;
+ Music * mark_ev_;
};
Mark_engraver::Mark_engraver ()
{
text_ =0;
- mark_req_ = 0;
+ mark_ev_ = 0;
}
void
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_->set_parent (s, X_AXIS);
}
typeset_grob (text_);
text_ =0;
}
+ mark_ev_ = 0;
}
void
-Mark_engraver::create_items (Request *rq)
+Mark_engraver::create_items (Music *ev)
{
if (text_)
return;
- SCM s = get_property ("RehearsalMark");
- text_ = new Item (s);
-
-
- announce_grob(text_, rq->self_scm());
-}
-
-
-void
-Mark_engraver::start_translation_timestep ()
-{
- mark_req_ = 0;
+ text_ = make_item ("RehearsalMark");
+ announce_grob(text_, ev->self_scm());
}
bool
Mark_engraver::try_music (Music* r)
{
- if (Mark_req *mr = dynamic_cast <Mark_req *> (r))
- {
- if (mark_req_ && mr->equal_b (mark_req_))
- return true;
- if (mark_req_)
- return false;
- mark_req_ = mr;
- return true;
- }
- return false;
+ mark_ev_ = r;
+ return true;
}
TODO: make the increment function in Scheme.
+
+ TODO: junk the number type for rehearsalMark
*/
void
Mark_engraver::process_music ()
{
- if (mark_req_)
+ if (mark_ev_)
{
- create_items (mark_req_);
-
- String t;
+ create_items (mark_ev_);
/*
automatic marks.
*/
+
- SCM m = mark_req_->get_mus_property ("label");
- if (gh_pair_p (m)) // markup text
- text_->set_grob_property ("text",m);
- else
+ SCM m = mark_ev_->get_mus_property ("label");
+ SCM proc = get_property ("markFormatter");
+ if (!Text_item::markup_p (m) &&
+ gh_procedure_p (proc))
{
- if (!gh_string_p (m) && !gh_number_p (m))
+ if (!gh_number_p (m))
m = get_property ("rehearsalMark");
-
- if (gh_number_p (m))
+
+ if (scm_integer_p (m) == SCM_BOOL_T
+ && scm_exact_p (m) == SCM_BOOL_T)
{
int mark_count = gh_scm2int (m);
- t = to_string (mark_count);
mark_count ++;
- m = gh_int2scm (mark_count);
- }
- else if (gh_string_p (m))
- {
- t = ly_scm2string (m);
- String next;
- if (t.length ())
- {
- char c = t[0];
- c++;
- next = to_string (c);
- }
- m = scm_makfrom0str (next.to_str0 ());
+ daddy_trans_->set_property ("rehearsalMark",
+ gh_int2scm (mark_count));
}
+
+ if (gh_number_p (m))
+ m = scm_call_2 (proc, m, daddy_trans_->self_scm ());
else
- {
- m = gh_int2scm (1);
- }
-
- daddy_trans_->set_property ("rehearsalMark", m);
-
- text_->set_grob_property ("text",
- scm_makfrom0str (t.to_str0 ()));
-
- String style = "mark-number";
- for (int i=0; i < t.length (); i++)
- {
- if (!isdigit (t[i]))
- {
- style = "mark-letter";
- break;
- }
- }
- SCM st = ly_symbol2scm (style.to_str0 ());
- text_->set_grob_property ("font-style", st);
+ warning ("rehearsalMark does not have integer value.");
}
+ if (Text_item::markup_p (m))
+ text_->set_grob_property ("text", m);
+ else
+ warning ("Mark label should be markup object.");
}
}
ENTER_DESCRIPTION(Mark_engraver,
/* descr */ "",
/* creats*/ "RehearsalMark",
-/* accepts */ "general-music",
-/* acks */ "bar-line-interface",
-/* reads */ "rehearsalMark stavesFound",
+/* accepts */ "mark-event",
+/* acks */ "bar-line-interface",
+/* reads */ "rehearsalMark markFormatter stavesFound",
/* write */ "");