Issue 2088: Replace automatic pointer-to-member function conversions

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 29fb3f0bdc028ae3fdc86704c847530f829c5b7d..1471c481b2d0805b1958b45be89d15a7954f07d7 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -23,7 +23,6 @@ using namespace std;
 
 #include "item.hh"
 #include "context.hh"
-#include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
 #include "engraver.hh"
 #include "direction.hh"
@@ -120,9 +119,12 @@ Clef_engraver::create_clef ()
           SCM txt = scm_number_to_string (scm_from_int (abs_oct),
                                           scm_from_int (10));
 
-          g->set_property ("text",
-                           scm_list_n (ly_lily_module_constant ("vcenter-markup"),
-                                       txt, SCM_UNDEFINED));
+          SCM style = get_property ("clefOctavationStyle");
+
+          SCM formatter = get_property ("clefOctavationFormatter");
+          if (ly_is_procedure (formatter))
+            g->set_property ("text", scm_call_2 (formatter, txt, style));
+
           Side_position_interface::add_support (g, clef_);
 
           g->set_parent (clef_, Y_AXIS);
@@ -213,6 +215,7 @@ ADD_TRANSLATOR (Clef_engraver,
                 /* read */
                 "clefGlyph "
                 "clefOctavation "
+                "clefOctavationStyle "
                 "clefPosition "
                 "explicitClefVisibility "
                 "forceClef ",