X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvaticana-ligature.cc;h=0477c0e78559b9a568bae674082cd7066d2edf6d;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=62a72141a1a0f42e2d86d14febce17a0fe37044f;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index 62a72141a1..0477c0e785 100644
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -3,12 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2006 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "vaticana-ligature.hh"
 
-#include <math.h>
 
 #include "item.hh"
 #include "font-interface.hh"
@@ -204,10 +203,10 @@ vaticana_brew_primitive (Grob *me)
   Real thickness = robust_scm2double (me->get_property ("thickness"), 1);
 
   Real line_thickness
-    = thickness * me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+    = thickness * me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
 
   Real blotdiameter
-    = (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+    = (me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
 
   int pos = Staff_symbol_referencer::get_rounded_position (me);
 
@@ -244,7 +243,7 @@ vaticana_brew_primitive (Grob *me)
     {
       out
 	= Font_interface::get_default_font (me)->
-	find_by_name ("noteheads." + glyph_name);
+	find_by_name ("noteheads.s" + glyph_name);
     }
   out.translate_axis (x_offset, X_AXIS);
   Real head_width = out.extent (X_AXIS).length ();
@@ -295,6 +294,15 @@ Vaticana_ligature::print (SCM)
 
 ADD_INTERFACE (Vaticana_ligature, "vaticana-ligature-interface",
 	       "A vaticana style gregorian ligature",
-	       "glyph-name flexa-height flexa-width thickness add-cauda "
-	       "add-stem add-join delta-pitch x-offset "
-	       "ligature-primitive-callback");
+
+	       /* properties */
+	       "glyph-name "
+	       "flexa-height " 
+	       "flexa-width "
+	       "thickness "
+	       "add-cauda "
+	       "add-stem "
+	       "add-join "
+	       "delta-pitch "
+	       "x-offset "
+	       );