source file of the GNU LilyPond music typesetter
- (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#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:
- TRANSLATOR_DECLARATIONS(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 ();
};
}
else if (System_start_delimiter::has_interface (inf.grob_))
{
- SCM gl = inf.grob_->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_string_p (gl) && gh_equal_p (gl, scm_makfrom0str ("brace"))
- && gh_string_p (my_gl) && gh_equal_p (my_gl, scm_makfrom0str ("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 (gh_string_p (gl) && gh_equal_p (gl, scm_makfrom0str ("bracket"))
- && gh_string_p (my_gl) && gh_equal_p (my_gl, scm_makfrom0str ("bracket")))
+ 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.grob_->translate_axis ( -0.8, X_AXIS); // ugh
- inf.grob_->set_grob_property ("arch-height",
- gh_double2scm(gh_scm2double(inf.grob_->get_grob_property
+ 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 ()
{
- SCM delim_name =get_property ("systemStartDelimiter");
- delim_ = new Spanner (internal_get_property (delim_name));
+ if (!delim_)
+ {
+ SCM delim_name = get_property ("systemStartDelimiter");
+ delim_ = make_spanner_from_properties (this, delim_name, SCM_EOL,
+ ly_symbol2string (delim_name).to_str0());
- delim_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
- announce_grob (delim_, SCM_EOL);
+ 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")));
+
+ }
}
-ENTER_DESCRIPTION(System_start_delimiter_engraver,
+ADD_TRANSLATOR (System_start_delimiter_engraver,
/* descr */ "Creates a system start delimiter (ie. SystemStart@{Bar,Brace,Bracket@} spanner",
/* creats*/ "SystemStartBar SystemStartBrace SystemStartBracket",
-/* acks */ "system-start-delimiter-interface staff-symbol-interface",
+/* accepts */ "",
+/* acks */ "system-start-delimiter-interface staff-symbol-interface",
/* reads */ "systemStartDelimiter",
/* write */ "");