source file of the GNU LilyPond music typesetter
- (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-
-
+#include "directional-element-interface.hh"
#include "engraver.hh"
#include "side-position-interface.hh"
#include "item.hh"
*/
class Text_engraver : public Engraver
{
- Link_array<Music> reqs_;
+ Link_array<Music> evs_;
Link_array<Item> texts_;
public:
- TRANSLATOR_DECLARATIONS(Text_engraver);
+ TRANSLATOR_DECLARATIONS (Text_engraver);
protected:
virtual bool try_music (Music* m);
virtual void stop_translation_timestep ();
- virtual void start_translation_timestep ();
virtual void process_acknowledged_grobs ();
virtual void acknowledge_grob (Grob_info);
};
{
if (m->is_mus_type ("text-script-event"))
{
- reqs_.push (m);
+ evs_.push (m);
return true;
}
return false;
{
if (texts_.size ())
return;
- for (int i=0; i < reqs_.size (); i++)
+ for (int i=0; i < evs_.size (); i++)
{
- Music * r = reqs_[i];
+ Music * r = evs_[i];
// URG: Text vs TextScript
- String basic = "TextScript";
+ Item *text = make_item ("TextScript");
- Item *text = new Item (get_property (basic.to_str0 ()));
-
- /*
- FIXME -> need to use basic props.
- */
- SCM axisprop = get_property ("scriptHorizontal");
- Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS;
+ Axis ax = Y_AXIS;
Side_position_interface::set_axis (text, ax);
// Hmm
int priority = 200;
- SCM s = text->get_grob_property ("script-priority");
+ SCM s = text->get_property ("script-priority");
if (gh_number_p (s))
priority = gh_scm2int (s);
/* see script-engraver.cc */
priority += i;
- text->set_grob_property ("script-priority", gh_int2scm (priority));
+ text->set_property ("script-priority", gh_int2scm (priority));
- Direction dir = to_dir (r->get_mus_property ("direction"));
+ Direction dir = to_dir (r->get_property ("direction"));
if (dir)
- Side_position_interface::set_direction (text, dir);
+ set_grob_direction (text, dir);
- SCM mark = r->get_mus_property ("text");
+ SCM mark = r->get_property ("text");
- if (new_markup_p (mark))
- text->set_grob_property ("molecule-callback", new_markup_brewer());
-
- text->set_grob_property ("text", mark);
+ text->set_property ("text", mark);
announce_grob (text, r->self_scm ());
texts_.push (text);
}
for (int i=0; i < texts_.size (); i++)
{
Item *ti = texts_[i];
- if (!to_boolean (get_property ("scriptHorizontal")))
- Side_position_interface::add_staff_support (ti);
typeset_grob (ti);
}
texts_.clear ();
+ evs_.clear ();
}
-void
-Text_engraver::start_translation_timestep ()
+
+Text_engraver::Text_engraver ()
{
- reqs_.clear ();
}
-
-Text_engraver::Text_engraver(){}
-
-ENTER_DESCRIPTION(Text_engraver,
+ENTER_DESCRIPTION (Text_engraver,
/* descr */ "Create text-scripts",
/* creats*/ "TextScript",
/* accepts */ "text-script-event",
/* acks */ "rhythmic-head-interface stem-interface",
-/* reads */ "scriptHorizontal",
+/* reads */ "",
/* write */ "");