* The grand 2005-2006 replace.

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

diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index eefe2fe760dc85ae4fa292957d64a0f2db51cbb6..0477c0e78559b9a568bae674082cd7066d2edf6d 100644 (file)
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -3,13 +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 <cmath>
-using namespace std;
 
 #include "item.hh"
 #include "font-interface.hh"
@@ -205,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);
 
@@ -245,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 ();
@@ -296,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 "
+              );