source file of the GNU LilyPond music typesetter
- (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include <ctype.h>
-#include "bar-line.hh"
+#include <cctype>
+using namespace std;
-#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 "axis-group-interface.hh"
+#include "bar-line.hh"
+#include "context.hh"
+#include "grob-array.hh"
+#include "international.hh"
#include "item.hh"
-#include "group-interface.hh"
-#include "text-item.hh"
+#include "stream-event.hh"
+#include "text-interface.hh"
+#include "warn.hh"
+
+#include "translator.icc"
/**
- put stuff over or next to bars. Examples: bar numbers, marginal notes,
- rehearsal marks.
- */
+ put stuff over or next to bars. Examples: bar numbers, marginal notes,
+ rehearsal marks.
+*/
class Mark_engraver : public Engraver
{
-public:
- TRANSLATOR_DECLARATIONS(Mark_engraver);
-protected:
- Item* text_;
-
-protected:
- virtual void stop_translation_timestep ();
- virtual void acknowledge_grob (Grob_info);
- void create_items (Music*);
- virtual bool try_music (Music *req);
- virtual void start_translation_timestep ();
- virtual void process_music ();
-
-private:
- Music * mark_req_;
-};
+ void create_items (Stream_event *);
+ Item *text_;
+ Stream_event *mark_ev_;
+public:
+ TRANSLATOR_DECLARATIONS (Mark_engraver);
+protected:
+ void process_music ();
+ void stop_translation_timestep ();
+ DECLARE_TRANSLATOR_LISTENER (mark);
+ DECLARE_ACKNOWLEDGER (break_alignment);
+};
Mark_engraver::Mark_engraver ()
{
- text_ =0;
- mark_req_ = 0;
+ text_ = 0;
+ mark_ev_ = 0;
}
void
-Mark_engraver::acknowledge_grob (Grob_info inf)
+Mark_engraver::acknowledge_break_alignment (Grob_info inf)
{
- Grob * s = inf.grob_;
- if (text_ && Bar_line::has_interface (s))
+ Grob *s = inf.grob ();
+ if (text_
+ && dynamic_cast<Item *> (s))
{
- /*
- 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);
}
}
-void
+
+void
Mark_engraver::stop_translation_timestep ()
{
if (text_)
- {
- text_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
- typeset_grob (text_);
- text_ =0;
- }
+ {
+ text_->set_object ("side-support-elements",
+ grob_list_to_grob_array (get_property ("stavesFound")));
+ text_ = 0;
+ }
+ mark_ev_ = 0;
}
-
void
-Mark_engraver::create_items (Music *rq)
+Mark_engraver::create_items (Stream_event *ev)
{
if (text_)
return;
- text_ = new Item (get_property ("RehearsalMark"));
- announce_grob(text_, rq->self_scm());
+ text_ = make_item ("RehearsalMark", ev->self_scm ());
}
-
+IMPLEMENT_TRANSLATOR_LISTENER (Mark_engraver, mark);
void
-Mark_engraver::start_translation_timestep ()
+Mark_engraver::listen_mark (Stream_event *ev)
{
- mark_req_ = 0;
+ ASSIGN_EVENT_ONCE (mark_ev_, ev);
}
-
-bool
-Mark_engraver::try_music (Music* r)
-{
- mark_req_ = r;
- return true;
-}
-
-
/*
-
TODO: make the increment function in Scheme.
-
*/
void
Mark_engraver::process_music ()
{
- if (mark_req_)
+ if (mark_ev_)
{
- create_items (mark_req_);
+ create_items (mark_ev_);
/*
automatic marks.
- */
-
- SCM m = mark_req_->get_mus_property ("label");
- if (Text_item::markup_p (m))
- {
- text_->set_grob_property ("text",m);
- }
- else
+ */
+
+ SCM m = mark_ev_->get_property ("label");
+ SCM proc = get_property ("markFormatter");
+ if (!Text_interface::is_markup (m)
+ && ly_is_procedure (proc))
{
- 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_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++;
- t = to_string (c);
- }
- m = scm_makfrom0str (t.to_str0 ());
- }
- else
- {
- m = gh_int2scm (1);
- t = to_string (1);
- }
-
- text_->set_grob_property ("text",
- scm_makfrom0str (t.to_str0 ()));
+ if (!scm_is_number (m))
+ m = get_property ("rehearsalMark");
- SCM series = SCM_EOL;
- SCM family = ly_symbol2scm ("number");
- for (int i=0; i < t.length (); i++)
+ if (scm_integer_p (m) == SCM_BOOL_T
+ && scm_exact_p (m) == SCM_BOOL_T)
{
- if (!isdigit (t[i]))
- {
- /*
- This looks strange, since \mark "A"
- isn't printed in bold.
-
- */
-
- // series = ly_symbol2scm ("bold");
- family = ly_symbol2scm ("roman");
- break;
- }
+ int mark_count = scm_to_int (m);
+ mark_count++;
+ context ()->set_property ("rehearsalMark",
+ scm_from_int (mark_count));
}
- if (gh_symbol_p (series))
- text_->set_grob_property ("font-series", series);
- if (gh_symbol_p (family))
- text_->set_grob_property ("font-family", family);
+
+ if (scm_is_number (m))
+ m = scm_call_2 (proc, m, context ()->self_scm ());
+ else
+ /* FIXME: constant error message. */
+ warning (_ ("rehearsalMark must have integer value"));
}
- daddy_trans_->set_property ("rehearsalMark", m);
+ if (Text_interface::is_markup (m))
+ text_->set_property ("text", m);
+ else
+ warning (_ ("mark label must be a markup object"));
}
}
-ENTER_DESCRIPTION(Mark_engraver,
-/* descr */ "",
-/* creats*/ "RehearsalMark",
-/* accepts */ "mark-event",
-/* acks */ "bar-line-interface",
-/* reads */ "rehearsalMark stavesFound",
-/* write */ "");
+ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);
+
+ADD_TRANSLATOR (Mark_engraver,
+ /* doc */
+ "Create @code{RehearsalMark} objects. It puts them on top of"
+ " all staves (which is taken from the property"
+ " @code{stavesFound}). If moving this engraver to a different"
+ " context, @ref{Staff_collecting_engraver} must move along,"
+ " otherwise all marks end up on the same Y@tie{}location.",
+
+ /* create */
+ "RehearsalMark ",
+
+ /* read */
+ "markFormatter "
+ "rehearsalMark "
+ "stavesFound ",
+
+ /* write */
+ ""
+ );
projects / lilypond.git / blobdiff