X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=5b07f61592ff964d53472b063d3781f614ebac2a;hb=0a0da41d935f7744e7ffd934034f25c40d4c59be;hp=01bf1d85c6f4a38e1d9ef26e6925124b95ef6a6b;hpb=993e0400c2ea45306fe9eb245e693b5ded258f0d;p=lilypond.git

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 01bf1d85c6..5b07f61592 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  ottova-engraver.cc -- implement Ottava_spanner_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2009 Han-Wen Nienhuys
 
-  (c) 2000--2007 Han-Wen Nienhuys
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "protected-scm.hh"
@@ -11,6 +22,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 +67,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 +141,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 */
+		""
+		);