source file of the GNU LilyPond music typesetter
- (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-
#include "system-start-delimiter.hh"
#include "engraver.hh"
#include "staff-symbol.hh"
#include "group-interface.hh"
#include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "spanner.hh"
class System_start_delimiter_engraver : public Engraver
{
public:
- VIRTUAL_COPY_CONS (Translator);
- System_start_delimiter_engraver ();
+ TRANSLATOR_DECLARATIONS (System_start_delimiter_engraver);
protected:
Spanner * delim_;
virtual void acknowledge_grob (Grob_info);
- virtual void initialize ();
+ virtual void process_music ();
virtual void finalize ();
};
-ADD_THIS_TRANSLATOR (System_start_delimiter_engraver);
+
void
System_start_delimiter_engraver::acknowledge_grob (Grob_info inf)
{
- if (Staff_symbol::has_interface (inf.elem_l_))
+ if (Staff_symbol::has_interface (inf.grob_))
{
/*
don't add as Axis_group_interface::add_element (delim_,),
because that would set the parent as well */
- Pointer_group_interface::add_element (delim_, "elements", inf.elem_l_);
+ Pointer_group_interface::add_grob (delim_, ly_symbol2scm ("elements"), inf.grob_);
}
- else if (System_start_delimiter::has_interface (inf.elem_l_))
+ else if (System_start_delimiter::has_interface (inf.grob_))
{
- SCM gl = inf.elem_l_->get_grob_property ("glyph");
- SCM my_gl = delim_->get_grob_property ("glyph");
+ SCM gl = inf.grob_->get_property ("glyph");
+ SCM my_gl = delim_->get_property ("glyph");
/*
UGH UGH
*/
- if (gh_symbol_p (gl) && gl == ly_symbol2scm ("brace")
- && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket"))
- inf.elem_l_->translate_axis (-0.8, X_AXIS); // ugh
- else if (gh_symbol_p (gl) && gl == ly_symbol2scm ("bracket")
- && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket"))
+ if (scm_is_string (gl) && ly_c_equal_p (gl, scm_makfrom0str ("brace"))
+ && scm_is_string (my_gl) && ly_c_equal_p (my_gl, scm_makfrom0str ("bracket")))
+ inf.grob_->translate_axis (-0.8, X_AXIS); // ugh
+ else if (scm_is_string (gl) && ly_c_equal_p (gl, scm_makfrom0str ("bracket"))
+ && scm_is_string (my_gl) && ly_c_equal_p (my_gl, scm_makfrom0str ("bracket")))
{
- inf.elem_l_->translate_axis ( -0.8, X_AXIS); // ugh
- inf.elem_l_->set_grob_property ("arch-height",
- gh_double2scm(gh_scm2double(inf.elem_l_->get_grob_property
+ inf.grob_->translate_axis ( -0.8, X_AXIS); // ugh
+ inf.grob_->set_property ("arch-height",
+ scm_make_real (scm_to_double (inf.grob_->get_property
("arch-height"))+0.5));
}
}
}
void
-System_start_delimiter_engraver::initialize ()
+System_start_delimiter_engraver::process_music ()
{
- delim_ = new Spanner (get_property ("SystemStartDelimiter"));
-
- delim_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
-
+ if (!delim_)
+ {
+ SCM delim_name = get_property ("systemStartDelimiter");
+ delim_ = make_spanner_from_properties (this, delim_name, SCM_EOL,
+ ly_symbol2string (delim_name).to_str0());
- announce_grob (delim_,0);
+ delim_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+
+ }
}
-
void
System_start_delimiter_engraver::finalize ()
{
- delim_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
- typeset_grob (delim_);
+ if (delim_)
+ {
+ delim_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+
+ }
}
+ADD_TRANSLATOR (System_start_delimiter_engraver,
+/* descr */ "Creates a system start delimiter (ie. SystemStart@{Bar,Brace,Bracket@} spanner",
+/* creats*/ "SystemStartBar SystemStartBrace SystemStartBracket",
+/* accepts */ "",
+/* acks */ "system-start-delimiter-interface staff-symbol-interface",
+/* reads */ "systemStartDelimiter",
+/* write */ "");