source file of the GNU LilyPond music typesetter
- (c) 2000--2003 Han-Wen Nienhuys
- Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2004 Han-Wen Nienhuys
*/
#include "protected-scm.hh"
class Ottava_spanner_engraver : public Engraver
{
public:
- TRANSLATOR_DECLARATIONS(Ottava_spanner_engraver);
+ TRANSLATOR_DECLARATIONS (Ottava_spanner_engraver);
protected:
virtual void finalize ();
virtual void acknowledge_grob (Grob_info);
virtual void process_music ();
virtual void stop_translation_timestep ();
+ virtual void derived_mark () const;
private:
Spanner *span_;
Spanner *finished_;
- Protected_scm last_ottavation_;
+ SCM last_ottavation_;
void typeset_all ();
};
+void
+Ottava_spanner_engraver::derived_mark () const
+{
+ scm_gc_mark (last_ottavation_ );
+}
Ottava_spanner_engraver::Ottava_spanner_engraver ()
{
{
finished_= span_;
span_ = 0;
- if (gh_string_p (ott))
+ if (scm_is_string (ott))
{
- span_ = new Spanner (get_property ("OttavaSpanner"));
- span_->set_grob_property ("edge-text", gh_cons (ott, SCM_EOL));
- announce_grob (span_, SCM_EOL);
+ span_ = make_spanner ("OttavaBracket", SCM_EOL);
+ span_->set_property ("text", ott);
+
- SCM c0 (get_property ("centralCPosition"));
+ SCM c0 (get_property ("middleCPosition"));
SCM oc0 (get_property ("originalCentralCPosition"));
if (scm_less_p (oc0, c0) == SCM_BOOL_T)
- span_->set_grob_property ("direction", gh_int2scm (DOWN));
+ span_->set_property ("direction", scm_int2num (DOWN));
}
}
last_ottavation_ = ott;
if (span_ && it && Note_column::has_interface (info.grob_))
{
Side_position_interface::add_support (span_, it);
+
if (!span_->get_bound (LEFT))
span_->set_bound (LEFT, it);
span_->set_bound (RIGHT, it);
}
while (flip (&d) != LEFT);
- typeset_grob (finished_);
finished_ = 0;
}
}
typeset_all ();
if (span_)
finished_ = span_;
- typeset_all();
+ typeset_all ();
+ last_ottavation_ = SCM_EOL;
}
-ENTER_DESCRIPTION(Ottava_spanner_engraver,
+ENTER_DESCRIPTION (Ottava_spanner_engraver,
/* descr */ "Create a text spanner when the ottavation property changes..",
-/* creats*/ "OttavaSpanner",
+/* creats*/ "OttavaBracket",
/* accepts */ "",
/* acks */ "note-column-interface",
/* reads */ "ottavation",