X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system.cc;h=b67eb0123b1154dadc5ab2e7a6c92ea81a8d7758;hb=8e2eaf4959bec63a1128a444591a540f4f1e2937;hp=909d40479d44e601067500cb79959b70e9108e8b;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index 909d40479d..b67eb0123b 100644
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2004--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
@@ -46,13 +46,13 @@ get_footnotes (SCM expr)
 
   SCM head = scm_car (expr);
 
-  if (head == ly_symbol2scm ("delay-stencil-evaluation"))
+  if (scm_is_eq (head, ly_symbol2scm ("delay-stencil-evaluation")))
     {
       // we likely need to do something here...just don't know what...
       return SCM_EOL;
     }
 
-  if (head == ly_symbol2scm ("combine-stencil"))
+  if (scm_is_eq (head, ly_symbol2scm ("combine-stencil")))
     {
       SCM out = SCM_EOL;
       SCM *tail = &out;
@@ -60,7 +60,7 @@ get_footnotes (SCM expr)
       for (SCM x = scm_cdr (expr); scm_is_pair (x); x = scm_cdr (x))
         {
           SCM footnote = get_footnotes (scm_car (x));
-          if (SCM_EOL != footnote)
+          if (!scm_is_null (footnote))
             {
               *tail = scm_cons (footnote, SCM_EOL);
               tail = SCM_CDRLOC (*tail);
@@ -68,10 +68,10 @@ get_footnotes (SCM expr)
         }
       return scm_append (out);
     }
-  if (head == ly_symbol2scm ("translate-stencil"))
+  if (scm_is_eq (head, ly_symbol2scm ("translate-stencil")))
     return get_footnotes (scm_caddr (expr));
 
-  if (head == ly_symbol2scm ("footnote"))
+  if (scm_is_eq (head, ly_symbol2scm ("footnote")))
     return scm_list_1 (scm_cdr (expr));
 
   return SCM_EOL;