Release: bump Welcome versions.

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

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 297337a976eb404c7b4096eb26307fb29c537578..08d3b419962ab833b4ead2389083662d0a87f0a0 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2012 Juergen Reuter <reuter@ipd.uka.de>
+  Copyright (C) 2002--2015 Juergen Reuter <reuter@ipd.uka.de>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -82,7 +82,8 @@
  * would require to have a single, complicated Ligature_engraver that
  * consists of all the code...  This needs further thoughts.
  */
-Ligature_engraver::Ligature_engraver ()
+Ligature_engraver::Ligature_engraver (Context *c)
+  : Engraver (c)
 {
   ligature_ = 0;
   finished_ligature_ = 0;
@@ -121,7 +122,7 @@ Ligature_engraver::process_music ()
       primitives_.clear ();
       ligature_ = 0;
     }
-  last_bound_ = unsmob_grob (get_property ("currentMusicalColumn"));
+  last_bound_ = unsmob<Grob> (get_property ("currentMusicalColumn"));
 
   if (ligature_)
     {
@@ -140,7 +141,7 @@ Ligature_engraver::process_music ()
       prev_start_event_ = events_drul_[START];
       ligature_ = create_ligature_spanner ();
 
-      Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
+      Grob *bound = unsmob<Grob> (get_property ("currentMusicalColumn"));
       if (!bound)
         events_drul_[START]->origin ()->warning (_ ("no left bound"));
       else
@@ -203,7 +204,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);
     }
 }