Release: bump Welcome versions.

[lilypond.git] / lily / note-head.cc

diff --git a/lily/note-head.cc b/lily/note-head.cc
index af516bef2b0092a708196b80da510ebf2bb35208..73a2255d9040a91199e994cf05c2fe0e6f9a74b5 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -23,6 +23,7 @@
 #include <cctype>
 #include <algorithm>            //  min, max
 
+using namespace std;
 
 #include "directional-element-interface.hh"
 #include "font-interface.hh"
@@ -32,14 +33,12 @@
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
 
-using std::string;
-
 static Stencil
 internal_print (Grob *me, string *font_char)
 {
   string style = robust_symbol2string (me->get_property ("style"), "default");
 
-  string suffix = ::to_string (std::min (robust_scm2int (me->get_property ("duration-log"), 2), 2));
+  string suffix = ::to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2));
   if (style != "default")
     suffix = robust_scm2string (me->get_property ("glyph-name"), "");
 
@@ -145,8 +144,8 @@ Note_head::include_ledger_line_height (SCM smob)
       // The +1 and -1 come from the fact that we only want to add
       // the interval between the note and the first ledger line, not
       // the whole interval between the note and the staff.
-      Interval iv (std::min (0.0, lines[UP] - my_ext[DOWN] + 1),
-                   std::max (0.0, lines[DOWN] - my_ext[UP] - 1));
+      Interval iv (min (0.0, lines[UP] - my_ext[DOWN] + 1),
+                   max (0.0, lines[DOWN] - my_ext[UP] - 1));
       return ly_interval2scm (iv);
     }
 
@@ -212,5 +211,6 @@ ADD_INTERFACE (Note_head,
                "glyph-name "
                "stem-attachment "
                "style "
+               "ledger-positions "
               );