X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvaticana-ligature.cc;h=861e4352a8dff1ff62027fd1f63f6eb1fa18f2c0;hb=e73abaa8b2125c63f0aa9a1cf4d1d702a094901c;hp=76e3162e41957dfe4f241097539ff8049646e13f;hpb=bbcb58184883768ca35d64451d7f693d2db11bb7;p=lilypond.git

diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index 76e3162e41..861e4352a8 100644
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2006 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "vaticana-ligature.hh"
@@ -126,7 +126,7 @@ vaticana_brew_flexa (Grob *me,
   if (solid)
     {
       Stencil solid_head
-	= Lookup::bezier_sandwich (top_curve, bottom_curve);
+	= Lookup::bezier_sandwich (top_curve, bottom_curve, 0.0);
       stencil.add_stencil (solid_head);
     }
   else // outline
@@ -134,13 +134,13 @@ vaticana_brew_flexa (Grob *me,
       Bezier inner_top_curve = top_curve;
       inner_top_curve.translate (Offset (0.0, -line_thickness));
       Stencil top_edge
-	= Lookup::bezier_sandwich (top_curve, inner_top_curve);
+	= Lookup::bezier_sandwich (top_curve, inner_top_curve, 0.0);
       stencil.add_stencil (top_edge);
 
       Bezier inner_bottom_curve = bottom_curve;
       inner_bottom_curve.translate (Offset (0.0, +line_thickness));
       Stencil bottom_edge
-	= Lookup::bezier_sandwich (bottom_curve, inner_bottom_curve);
+	= Lookup::bezier_sandwich (bottom_curve, inner_bottom_curve, 0.0);
       stencil.add_stencil (bottom_edge);
 
       /*
@@ -174,9 +174,9 @@ vaticana_brew_join (Grob *me, int delta_pitch,
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   if (!delta_pitch)
     {
-      me->programming_error (_f ("Vaticana_ligature: "
-				 "zero join (delta_pitch == 0)"));
-      return Stencil ();
+      me->programming_error (_ ("Vaticana_ligature: "
+				"zero join (delta_pitch == 0)"));
+      return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
     }
   Interval x_extent = Interval (0, join_thickness);
   Interval y_extent = (delta_pitch > 0)
@@ -194,10 +194,10 @@ vaticana_brew_primitive (Grob *me)
     {
       me->programming_error ("Vaticana_ligature: "
 			     "undefined glyph-name -> ignoring grob");
-      return Stencil ();
+      return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
     }
 
-  std::string glyph_name = ly_scm2string (glyph_name_scm);
+  string glyph_name = ly_scm2string (glyph_name_scm);
 
   Stencil out;
   Real thickness = robust_scm2double (me->get_property ("thickness"), 1);
@@ -210,7 +210,7 @@ vaticana_brew_primitive (Grob *me)
 
   int pos = Staff_symbol_referencer::get_rounded_position (me);
 
-  SCM delta_pitch_scm = me->get_property ("delta-pitch");
+  SCM delta_pitch_scm = me->get_property ("delta-position");
   int delta_pitch;
   if (delta_pitch_scm != SCM_EOL)
     delta_pitch = scm_to_int (delta_pitch_scm);
@@ -292,17 +292,17 @@ Vaticana_ligature::print (SCM)
   return SCM_EOL;
 }
 
-ADD_INTERFACE (Vaticana_ligature, "vaticana-ligature-interface",
-	       "A vaticana style gregorian ligature",
+ADD_INTERFACE (Vaticana_ligature,
+	       "A vaticana style Gregorian ligature.",
 
 	       /* properties */
 	       "glyph-name "
-	       "flexa-height " 
+	       "flexa-height "
 	       "flexa-width "
 	       "thickness "
 	       "add-cauda "
 	       "add-stem "
 	       "add-join "
-	       "delta-pitch "
+	       "delta-position "
 	       "x-offset "
 	       );