Fix 626

Make ottavation property read by Ottava_spanner_engraver accept
a markup.

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index f1042877963d6b3eba29f0973cdb9f2b7f90b843..196eb25174c26e2a201b1da6d83c224f38619e99 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -1,11 +1,12 @@
 /*
-  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
 */
 
+#include "text-interface.hh"
 #include "protected-scm.hh"
 #include "note-column.hh"
 #include "side-position-interface.hh"
@@ -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);

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index 357a3e02f4239aca187a74f55f2a3bdde71576f7..f763a18846a73fd3fe094541bc423c8dcee029a1 100644 (file)
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -329,7 +329,7 @@ repeated section for a page turn to be allowed within that section.")
 Parameters: A list of note events and a list of tabstring events.")
 
 
-     (ottavation ,string? "If set, the text for an ottava spanner.
+     (ottavation ,markup? "If set, the text for an ottava spanner.
 Changing this creates a new text spanner.")
      (output ,ly:music-output? "The output produced by a score-level
 translator during music interpretation.")