X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmensural-ligature.cc;h=4f9e64c96193291a4cd724e23c5d842e70b7d477;hb=f6be35e426e21f654ff9e8079df60960a0d787c4;hp=250a0f9411ec1d88671320633b1d5441032af647;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git

diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 250a0f9411..4f9e64c961 100644
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -3,20 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>,
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>,
   Pal Benko <benkop@freestart.hu>
 */
 
-#include <cmath>
-using namespace std;
-
 #include "mensural-ligature.hh"
-#include "item.hh"
+
 #include "font-interface.hh"
+#include "international.hh"
+#include "item.hh"
 #include "lookup.hh"
-#include "staff-symbol-referencer.hh"
 #include "note-head.hh"
 #include "output-def.hh"
+#include "staff-symbol-referencer.hh"
 #include "warn.hh"
 
 /*
@@ -97,7 +96,7 @@ internal_brew_primitive (Grob *me)
     {
       programming_error ("Mensural_ligature: "
 			 "undefined primitive -> ignoring grob");
-      return Stencil ();
+      return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
     }
   int primitive = scm_to_int (primitive_scm);
 
@@ -111,7 +110,7 @@ internal_brew_primitive (Grob *me)
 
   if (primitive & MLP_FLEXA)
     {
-      delta_pitch = robust_scm2int (me->get_property ("delta-pitch"),
+      delta_pitch = robust_scm2int (me->get_property ("delta-position"),
 				    0);
       width
 	= robust_scm2double (me->get_property ("flexa-width"), 2.0 * staff_space);
@@ -122,30 +121,30 @@ internal_brew_primitive (Grob *me)
   switch (primitive & MLP_ANY)
     {
     case MLP_NONE:
-      return Stencil ();
+      return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
     case MLP_LONGA: // mensural brevis head with right cauda
       out = Font_interface::get_default_font (me)->find_by_name
-	("noteheads.s-2mensural");
+	("noteheads.sM2mensural");
       break;
     case MLP_BREVIS: // mensural brevis head
       out = Font_interface::get_default_font (me)->find_by_name
-	("noteheads.s-1mensural");
+	("noteheads.sM1mensural");
       break;
     case MLP_MAXIMA: // should be mensural maxima head without stem
       out = Font_interface::get_default_font (me)->find_by_name
-	("noteheads.s-1neomensural");
+	("noteheads.sM1neomensural");
       break;
     case MLP_FLEXA:
       out = brew_flexa (me, delta_pitch, false, width, thickness);
       break;
     default:
-      programming_error (_f ("Mensural_ligature: "
-			     "unexpected case fall-through"));
-      return Stencil ();
+      programming_error (_ ("Mensural_ligature: "
+			    "unexpected case fall-through"));
+      return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
     }
 
   Real blotdiameter
-    = (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+    = (me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")));
 
   if (primitive & MLP_STEM)
     {
@@ -168,7 +167,7 @@ internal_brew_primitive (Grob *me)
 
   SCM join_right_scm = me->get_property ("join-right-amount");
 
-  if (join_right_scm != SCM_EOL)
+  if (scm_is_number (join_right_scm))
     {
       int join_right = scm_to_int (join_right_scm);
       if (join_right)
@@ -190,7 +189,7 @@ internal_brew_primitive (Grob *me)
 	  out.add_stencil (join);
 	}
       else
-	programming_error (_f ("Mensural_ligature: (join_right == 0)"));
+	programming_error (_ ("Mensural_ligature: (join_right == 0)"));
     }
 
 #if 0 /* what happend with the ledger lines? */
@@ -220,7 +219,15 @@ Mensural_ligature::print (SCM)
   return SCM_EOL;
 }
 
-ADD_INTERFACE (Mensural_ligature, "mensural-ligature-interface",
-	       "A mensural ligature",
-	       "delta-pitch flexa-width head-width join-right-amount " // "add-join "
-	       "ligature-primitive-callback primitive thickness");
+ADD_INTERFACE (Mensural_ligature,
+	       "A mensural ligature.",
+
+	       /* properties */
+	       "delta-position "
+	       "flexa-width "
+	       "head-width "
+	       "join-right-amount "
+	       "primitive "
+	       "thickness "
+	       );
+