release: 1.5.29

[lilypond.git] / lily / lily-guile.cc

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 42d28ecdd5a5596ecdf6cbb2bd8532737fcb096b..3e1abf676547e905dbd259c7906cf275c5f3e2fa 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
@@ -22,6 +22,7 @@
 #include "direction.hh"
 #include "offset.hh"
 #include "interval.hh"
+#include "pitch.hh"
 
 SCM
 ly_last (SCM list)
@@ -276,6 +277,7 @@ init_lily_guile (String p )
   if (verbose_global_b)
     progress_indication ("\n");
   read_lily_scm_file ("lily.scm");
+
   scm_set_current_module (last_mod);
 }
 
@@ -518,6 +520,39 @@ ly_assoc_chain (SCM key, SCM achain)
     return SCM_BOOL_F;
 }
 
+/* looks the key up in the cdrs of the alist-keys
+   - ignoring the car and ignoring non-pair keys.
+   Returns first match found, i.e.
+
+   alist = ((1 . 10)
+                   ((1 . 2) . 11)
+                   ((2 . 1) . 12)
+                   ((3 . 0) . 13)
+                   ((4 . 1) . 14) )
+
+I would like (ly_assoc_cdr 1) to return 12 - because it's the first
+element with the cdr of the key = 1.  In other words (alloc_cdr key)
+corresponds to call
+
+(alloc (anything . key))
+
+
+
+*/
+SCM
+ly_assoc_cdr (SCM key, SCM alist)
+{
+  if (gh_pair_p (alist)) {
+    SCM trykey = ly_caar(alist);
+    if(gh_pair_p(trykey) && to_boolean(scm_equal_p(key,ly_cdr(trykey))))
+      return ly_car(alist);
+    else
+      return ly_assoc_cdr (key, ly_cdr (alist));
+  }
+  else
+    return SCM_BOOL_F;
+}
+
 /*
   LIST has the form "sym1 sym2 sym3" 
  */