From: John Mandereau <john.mandereau@gmail.com>
Date: Sat, 24 May 2008 20:00:49 +0000 (+0200)
Subject: Fix 626
X-Git-Tag: release/2.11.47-1~5^2~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9d443bdf00804696a1c48bb3c08fe75543044ad9;p=lilypond.git

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 f104287796..196eb25174 100644
--- 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 357a3e02f4..f763a18846 100644
--- 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.")