X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=cfb88a2c3a69083c7966b68f077fde7f3303ef96;hb=1910858321182f0f642ec766f90254a81ac69c2f;hp=01bf1d85c6f4a38e1d9ef26e6925124b95ef6a6b;hpb=993e0400c2ea45306fe9eb245e693b5ded258f0d;p=lilypond.git diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index 01bf1d85c6..cfb88a2c3a 100644 --- a/lily/ottava-engraver.cc +++ b/lily/ottava-engraver.cc @@ -1,9 +1,9 @@ /* - ottova-engraver.cc -- implement Ottava_spanner_engraver + ottava-engraver.cc -- implement Ottava_spanner_engraver source file of the GNU LilyPond music typesetter - (c) 2000--2007 Han-Wen Nienhuys + (c) 2000--2008 Han-Wen Nienhuys */ #include "protected-scm.hh" @@ -11,6 +11,7 @@ #include "side-position-interface.hh" #include "engraver.hh" #include "spanner.hh" +#include "text-interface.hh" #include "item.hh" class Ottava_spanner_engraver : public Engraver @@ -55,7 +56,7 @@ Ottava_spanner_engraver::process_music () { 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); @@ -129,12 +130,17 @@ Ottava_spanner_engraver::finalize () ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column); ADD_TRANSLATOR (Ottava_spanner_engraver, - /* doc */ "Create a text spanner when the ottavation property changes..", - /* create */ "OttavaBracket", - /* read */ "ottavation " + /* doc */ + "Create a text spanner when the ottavation property changes.", + + /* create */ + "OttavaBracket ", + + /* read */ + "ottavation " "originalMiddleCPosition " - "currentMusicalColumn " - - , + "currentMusicalColumn ", - /* write */ ""); + /* write */ + "" + );