Web: Update Contact Us section

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

diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 164b12a9f14f1523fc48bda2ba37cdc5cb370848..c7744d1f4b2db3288cbbb252f12ccd0e4b9d4824 100644 (file)
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -78,6 +78,9 @@ void
 Glissando_engraver::acknowledge_note_column (Grob_info info)
 {
   Grob *g = info.grob ();
+  if (to_boolean (g->get_property ("glissando-skip")))
+    return;
+
   if (stop_glissandi_)
     {
       extract_grob_set (g, "note-heads", note_heads);
@@ -107,7 +110,7 @@ Glissando_engraver::acknowledge_note_column (Grob_info info)
     {
       extract_grob_set (g, "note-heads", note_heads);
       SCM map = get_property ("glissandoMap");
-      if (map == SCM_EOL)
+      if (scm_is_null (map))
         for (vsize i = 0; i < note_heads.size (); i++)
           {
             note_column_1.push_back (i);
@@ -121,7 +124,7 @@ Glissando_engraver::acknowledge_note_column (Grob_info info)
               continue;
             int n1 = robust_scm2int (scm_car (candidate), -1);
             int n2 = robust_scm2int (scm_cdr (candidate), -1);
-            if ((n1 < 0) || (n2 < 0) || (size_t(n1) >= note_heads.size ()))
+            if ((n1 < 0) || (n2 < 0) || (size_t (n1) >= note_heads.size ()))
               continue;
             note_column_1.push_back (vsize (n1));
             note_column_2.push_back (vsize (n2));