* mf/GNUmakefile (FC_FIND): new function. Find ncsb using

[lilypond.git] / lily / volta-engraver.cc

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index 7185b8fb4b7afc39101786299d4c014fdcba7a0a..1f64defa4a533b066acc1ce9ae25c021584c2367 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -3,17 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
+
+#include "bar-line.hh"
 #include "context.hh"
-#include "volta-bracket.hh"
+#include "international.hh"
 #include "note-column.hh"
-#include "bar-line.hh"
 #include "side-position-interface.hh"
-#include "warn.hh"
 #include "staff-symbol.hh"
+#include "text-interface.hh"
+#include "volta-bracket.hh"
+#include "warn.hh"
 
 #include "translator.icc"
 
@@ -72,9 +75,7 @@ Volta_engraver::staff_eligible ()
 {
   SCM doit = get_property ("voltaOnThisStaff");
   if (scm_is_bool (doit))
-    {
-      return to_boolean (doit);
-    }
+    return to_boolean (doit);
 
   if (!unsmob_grob (staff_))
     return false;
@@ -162,7 +163,7 @@ Volta_engraver::process_music ()
     }
 
   if (!volta_span_
-      && (scm_is_string (start_string_) || scm_is_pair (start_string_)))
+      && Text_interface::is_markup (start_string_))
     {
       started_mom_ = now_mom ();