Release: bump Welcome versions.

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

diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index 42511f7243f141c7071630eeb5b94fad823d8ee5..ddbe0d86bd2ffa12f3054c5b005cb21c73754d6c 100644 (file)
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2003--2011 Juergen Reuter <reuter@ipd.uka.de>
+  Copyright (C) 2003--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
@@ -37,8 +37,7 @@ vaticana_brew_cauda (Grob *me,
                      Real blotdiameter)
 {
   bool on_staffline = Staff_symbol_referencer::on_line (me, pos);
-  int interspaces = Staff_symbol_referencer::line_count (me) - 1;
-  bool above_staff = pos > interspaces;
+  bool above_staff = pos > Staff_symbol_referencer::staff_span (me)[UP];
 
   if (delta_pitch > -1)
     {
@@ -87,7 +86,7 @@ vaticana_brew_flexa (Grob *me,
 
   Real interval;
   SCM flexa_height_scm = me->get_property ("flexa-height");
-  if (flexa_height_scm != SCM_EOL)
+  if (!scm_is_null (flexa_height_scm))
     interval = scm_to_int (flexa_height_scm);
   else
     {
@@ -185,8 +184,8 @@ vaticana_brew_join (Grob *me, int delta_pitch,
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   if (!delta_pitch)
     {
-      me->programming_error (_ ("Vaticana_ligature: "
-                                "zero join (delta_pitch == 0)"));
+      me->programming_error ("Vaticana_ligature: "
+                             "zero join (delta_pitch == 0)");
       return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
     }
   Interval x_extent = Interval (0, join_thickness);
@@ -201,7 +200,7 @@ Stencil
 vaticana_brew_primitive (Grob *me)
 {
   SCM glyph_name_scm = me->get_property ("glyph-name");
-  if (glyph_name_scm == SCM_EOL)
+  if (scm_is_null (glyph_name_scm))
     {
       me->programming_error ("Vaticana_ligature: "
                              "undefined glyph-name -> ignoring grob");
@@ -223,7 +222,7 @@ vaticana_brew_primitive (Grob *me)
 
   SCM delta_pitch_scm = me->get_property ("delta-position");
   int delta_pitch;
-  if (delta_pitch_scm != SCM_EOL)
+  if (!scm_is_null (delta_pitch_scm))
     delta_pitch = scm_to_int (delta_pitch_scm);
   else
     delta_pitch = 0;
@@ -291,7 +290,7 @@ MAKE_SCHEME_CALLBACK (Vaticana_ligature, brew_ligature_primitive, 1);
 SCM
 Vaticana_ligature::brew_ligature_primitive (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
   SCM primitive = vaticana_brew_primitive (me).smobbed_copy ();
   return primitive;
 }