* lily/include/music.hh (class Music): unvirtualize transpose().

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

diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index 3c0d309964b224b7517717820bf7f54edc2aaa36..0553018834214843c590d6f72f1ee0a993fbef3b 100644 (file)
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -6,11 +6,12 @@
   (c) 2003--2004 Juergen Reuter <reuter@ipd.uka.de>
 */
 
+#include "vaticana-ligature.hh"
+
 #include <math.h>
+
 #include "item.hh"
-#include "vaticana-ligature.hh"
 #include "font-interface.hh"
-#include "stencil.hh"
 #include "lookup.hh"
 #include "staff-symbol-referencer.hh"
 #include "note-head.hh"
@@ -207,10 +208,10 @@ vaticana_brew_primitive (Grob *me)
   Real thickness = robust_scm2double ( me->get_property ("thickness"), 1);
 
   Real line_thickness =
-    thickness * me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+    thickness * me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
 
   Real blotdiameter =
-    (me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+    (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
 
   int pos = Staff_symbol_referencer::get_rounded_position (me);
 
@@ -249,7 +250,7 @@ vaticana_brew_primitive (Grob *me)
     {
       out =
        Font_interface::get_default_font (me)->
-       find_by_name ("noteheads-" + glyph_name);
+       find_by_name ("noteheads." + glyph_name);
     }
   out.translate_axis (x_offset, X_AXIS);
   Real head_width = out.extent (X_AXIS).length ();