Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index a36f1b17239386c35421129dff891a4f6bfbb111..88a11810581abb86de38528c15456d7399803d04 100644 (file)
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -96,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);
 
@@ -110,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);
@@ -121,7 +121,7 @@ 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");
@@ -140,7 +140,7 @@ internal_brew_primitive (Grob *me)
     default:
       programming_error (_f ("Mensural_ligature: "
                             "unexpected case fall-through"));
-      return Stencil ();
+      return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
     }
 
   Real blotdiameter
@@ -167,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)
@@ -219,7 +219,14 @@ Mensural_ligature::print (SCM)
   return SCM_EOL;
 }
 
-ADD_INTERFACE (Mensural_ligature, "mensural-ligature-interface",
+ADD_INTERFACE (Mensural_ligature,
               "A mensural ligature",
-              "delta-pitch flexa-width head-width join-right-amount " // "add-join "
-              "primitive thickness");
+
+              "delta-position "
+              "flexa-width "
+              "head-width "
+              "join-right-amount "
+              "primitive "
+              "thickness"
+              );
+