Merge remote-tracking branch 'origin/translation' into staging

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

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 3ca686b2f3bbb785345a385aaf63d0365d77536a..80624c40a81441b6da7fa3339e8b423a7d8adbc1 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ internal_print (Grob *me, string *font_char)
 {
   string style = robust_symbol2string (me->get_property ("style"), "default");
 
-  string suffix = to_string (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"), "");
 
@@ -64,7 +64,8 @@ internal_print (Grob *me, string *font_char)
   if (style == "mensural"
       || style == "neomensural"
       || style == "petrucci"
-      || style == "baroque")
+      || style == "baroque"
+      || style == "kievan")
     {
       if (!Staff_symbol_referencer::on_line
           (me,
@@ -79,6 +80,15 @@ internal_print (Grob *me, string *font_char)
         }
     }
 
+  if (style == "kievan"
+      && 3 == robust_scm2int (me->get_property ("duration-log"), 2))
+    {
+      Grob *stem = unsmob_grob (me->get_object ("stem"));
+      Grob *beam = unsmob_grob (stem->get_object ("beam"));
+      if (beam)
+        out = fm->find_by_name (idx_either + "2kievan");
+    }
+
   idx_either += suffix;
   if (out.is_empty ())
     {
@@ -152,7 +162,7 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
 }
 
 Offset
-Note_head::get_stem_attachment (Font_metric *fm, string key)
+Note_head::get_stem_attachment (Font_metric *fm, const string &key)
 {
   Offset att;