Issue 4625/4: Move in-chord slur info to slur boundaries

[lilypond.git] / lily / vaticana-ligature.cc

diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index 2066716b802738b705fed27b35207fa78e5400dd..c8be2880132f53aa32d1a93b55d33041883522fe 100644 (file)
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -29,6 +29,8 @@
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
 
+using std::string;
+
 Stencil
 vaticana_brew_cauda (Grob *me,
                      int pos,
@@ -106,7 +108,7 @@ vaticana_brew_flexa (Grob *me,
    */
   Real left_height
     = right_height
-      + min (0.12 * abs (interval), 0.3) * staff_space;
+      + std::min (0.12 * abs (interval), 0.3) * staff_space;
 
   /*
    * Compensate optical illusion regarding vertical position of left
@@ -290,7 +292,7 @@ MAKE_SCHEME_CALLBACK (Vaticana_ligature, brew_ligature_primitive, 1);
 SCM
 Vaticana_ligature::brew_ligature_primitive (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
   SCM primitive = vaticana_brew_primitive (me).smobbed_copy ();
   return primitive;
 }