release: 1.5.29

[lilypond.git] / lily / chord.cc

diff --git a/lily/chord.cc b/lily/chord.cc
index abe879cdbd299de24b8d79bc501b30d8bc27bcfa..908d8f4432eaca03ec5bf0819046c3b3ede8f5ab 100644 (file)
--- a/lily/chord.cc
+++ b/lily/chord.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord.hh"
@@ -27,7 +27,7 @@ ly_unique (SCM list)
   for (SCM i = list; gh_pair_p (i); i = ly_cdr (i))
     {
       if (!gh_pair_p (ly_cdr (i))
-         || !gh_equal_p (ly_car (i), gh_cadr (i)))
+         || !gh_equal_p (ly_car (i), ly_cadr (i)))
        unique = gh_cons (ly_car (i), unique);
     }
   return gh_reverse (unique);
@@ -341,7 +341,7 @@ Chord::tonic_add_sub_to_pitches (SCM tonic, SCM add, SCM sub)
     missing = lower_step (tonic, missing, gh_int2scm (0));
   
   /* if additions include any 3, don't add third */
-  SCM third = gh_cadr (base_pitches (tonic));
+  SCM third = ly_cadr (base_pitches (tonic));
   if (member_notename (third, add) != SCM_BOOL_F)
     missing = scm_delete (third, missing);