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"
-#include "musical-request.hh"
+#include "event.hh"
#include "stem.hh"
#include "rhythmic-head.hh"
+#include "text-item.hh"
/**
*/
class Text_engraver : public Engraver
{
- Link_array<Text_script_req> reqs_;
+ Link_array<Music> reqs_;
Link_array<Item> texts_;
public:
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);
};
bool
Text_engraver::try_music (Music *m)
{
- if (dynamic_cast<Text_script_req*> (m)
- && m->get_mus_property ("text-type") != ly_symbol2scm ("finger")
- && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic"))
+ if (m->is_mus_type ("text-script-event"))
{
- reqs_.push (dynamic_cast<Text_script_req*> (m));
+ reqs_.push (m);
return true;
}
return false;
return;
for (int i=0; i < reqs_.size (); i++)
{
- Text_script_req * r = reqs_[i];
+ Music * r = reqs_[i];
// URG: Text vs TextScript
String basic = "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
text->set_grob_property ("script-priority", gh_int2scm (priority));
- if (r->get_direction ())
- Side_position_interface::set_direction (text, r->get_direction ());
-
- text->set_grob_property ("text", r->get_mus_property ("text"));
+ Direction dir = to_dir (r->get_mus_property ("direction"));
+ if (dir)
+ set_grob_direction (text, dir);
+
+
+ SCM mark = r->get_mus_property ("text");
+
+ text->set_grob_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 ();
-}
-
-void
-Text_engraver::start_translation_timestep ()
-{
reqs_.clear ();
}
-Text_engraver::Text_engraver(){}
+Text_engraver::Text_engraver ()
+{
+}
ENTER_DESCRIPTION(Text_engraver,
/* descr */ "Create text-scripts",
/* creats*/ "TextScript",
-/* accepts */ "general-music",
+/* accepts */ "text-script-event",
/* acks */ "rhythmic-head-interface stem-interface",
-/* reads */ "scriptHorizontal",
+/* reads */ "",
/* write */ "");