Issue 4131/1: Reimplement forced partcombine decisions via context properties

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

diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 92a1c9d36c42a55614cdd5586a0d123aa2536abe..3d605ec5eb9e7829141309842d655e2d3b118032 100644 (file)
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2014 Juergen Reuter <reuter@ipd.uka.de>,
+  Copyright (C) 2002--2015 Juergen Reuter <reuter@ipd.uka.de>,
   Pal Benko <benkop@freestart.hu>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -30,6 +30,8 @@
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
 
+using std::string;
+
 /*
   draws one half a flexa, i.e. a portion corresponding to a single note.
   this way coloration of the two notes building up the flexa can be
@@ -117,7 +119,7 @@ Stencil
 internal_brew_primitive (Grob *me)
 {
   SCM primitive_scm = me->get_property ("primitive");
-  if (primitive_scm == SCM_EOL)
+  if (scm_is_null (primitive_scm))
     {
       programming_error ("Mensural_ligature:"
                          " undefined primitive -> ignoring grob");
@@ -270,7 +272,7 @@ MAKE_SCHEME_CALLBACK (Mensural_ligature, brew_ligature_primitive, 1);
 SCM
 Mensural_ligature::brew_ligature_primitive (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
   return internal_brew_primitive (me).smobbed_copy ();
 }