/*
- text-spanner-engraver.cc -- implement Ottava_spanner_engraver
+ ottava-engraver.cc -- implement Ottava_spanner_engraver
source file of the GNU LilyPond music typesetter
- (c) 2000--2005 Han-Wen Nienhuys
+ (c) 2000--2008 Han-Wen Nienhuys
*/
#include "protected-scm.hh"
#include "note-column.hh"
#include "side-position-interface.hh"
#include "engraver.hh"
+#include "spanner.hh"
+#include "text-interface.hh"
+#include "item.hh"
class Ottava_spanner_engraver : public Engraver
{
TRANSLATOR_DECLARATIONS (Ottava_spanner_engraver);
protected:
virtual void finalize ();
-
- DECLARE_ACKNOWLEDGER(note_column);
-
- PRECOMPUTED_VIRTUAL void process_music ();
- PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+
+ DECLARE_ACKNOWLEDGER (note_column);
+
+ void process_music ();
+ void stop_translation_timestep ();
virtual void derived_mark () const;
private:
Spanner *span_;
{
finished_ = span_;
span_ = 0;
- if (scm_is_string (ott))
+ if (Text_interface::is_markup (ott))
{
span_ = make_spanner ("OttavaBracket", SCM_EOL);
span_->set_property ("text", ott);
- SCM c0 (get_property ("middleCPosition"));
- SCM oc0 (get_property ("originalCentralCPosition"));
- if (scm_less_p (oc0, c0) == SCM_BOOL_T)
- span_->set_property ("direction", scm_int2num (DOWN));
+ SCM offset (get_property ("middleCOffset"));
+ if (robust_scm2double (offset, 0) > 0)
+ span_->set_property ("direction", scm_from_int (DOWN));
}
}
last_ottavation_ = ott;
void
Ottava_spanner_engraver::acknowledge_note_column (Grob_info info)
{
- Item *it = info.item();
+ Item *it = info.item ();
if (span_ && it)
{
Side_position_interface::add_support (span_, it);
}
#include "translator.icc"
-ADD_ACKNOWLEDGER(Ottava_spanner_engraver, note_column);
+
+ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column);
+
ADD_TRANSLATOR (Ottava_spanner_engraver,
- /* descr */ "Create a text spanner when the ottavation property changes..",
- /* creats*/ "OttavaBracket",
- /* accepts */ "",
- /* reads */ "ottavation",
- /* write */ "");
+ /* doc */
+ "Create a text spanner when the ottavation property changes.",
+
+ /* create */
+ "OttavaBracket ",
+
+ /* read */
+ "ottavation "
+ "originalMiddleCPosition "
+ "currentMusicalColumn ",
+
+ /* write */
+ ""
+ );