X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-engraver.cc;h=f3bac03c76955f62a913224224d3966aacc2016c;hb=88aee98e9414b1ea25efbbec913960f26c6ced82;hp=4fde7110559cf570ee823dc37e021dcbfc0324aa;hpb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;p=lilypond.git

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 4fde711055..f3bac03c76 100644
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -121,7 +121,7 @@ Ligature_engraver::process_music ()
       primitives_.clear ();
       ligature_ = 0;
     }
-  last_bound_ = Grob::unsmob (get_property ("currentMusicalColumn"));
+  last_bound_ = unsmob<Grob> (get_property ("currentMusicalColumn"));
 
   if (ligature_)
     {
@@ -140,7 +140,7 @@ Ligature_engraver::process_music ()
       prev_start_event_ = events_drul_[START];
       ligature_ = create_ligature_spanner ();
 
-      Grob *bound = Grob::unsmob (get_property ("currentMusicalColumn"));
+      Grob *bound = unsmob<Grob> (get_property ("currentMusicalColumn"));
       if (!bound)
         events_drul_[START]->origin ()->warning (_ ("no left bound"));
       else
@@ -203,7 +203,7 @@ Ligature_engraver::acknowledge_ligature_head (Grob_info info)
   if (ligature_)
     {
       primitives_.push_back (info);
-      if (info.grob () && brew_ligature_primitive_proc != SCM_EOL)
+      if (info.grob () && !scm_is_null (brew_ligature_primitive_proc))
         info.grob ()->set_property ("stencil", brew_ligature_primitive_proc);
     }
 }