(start_translation_timestep): split

scm_cadddr

diff --git a/ChangeLog b/ChangeLog
index 29040fdc35f9b2e24f8106a64ba7492f737016a9..452f8d5f0bac4e87e03b10055629635d3f1573bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/grace-engraver.cc (start_translation_timestep): split
+       scm_cadddr
+       
 2004-11-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/quote-iterator.cc (Module): remove old quote-iterator

diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc
index 352fc840fd57325acd08aed5f3a72e367ebae1b5..ee998dda5d64d8577562cd1672830245510d9cd9 100644 (file)
--- a/lily/grace-engraver.cc
+++ b/lily/grace-engraver.cc
@@ -65,7 +65,7 @@ Grace_engraver::start_translation_timestep ()
          SCM context_name = scm_car (entry);
          SCM grob = scm_cadr (entry);
          SCM sym = scm_caddr (entry);
-         SCM val = scm_cadddr (entry);
+         SCM val = scm_cadr (scm_cddr (entry));
 
          Context *c = context ();
          while (c  

diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index 94872ae65764a3000fe8d1917ed32ce7c613f7ab..5fe821ff5f32a759885e14b3d47bbfd11715d2db 100644 (file)
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -504,7 +504,7 @@ the mark when there are no spanners active."
         (context (ly:run-translator (context-spec-music mus 'Voice)
                                     part-combine-listener))
         (first-voice-handle (last-pair noticed)))
-
+q
     ;; (display (last-pair noticed))
     (if (pair? first-voice-handle)
        (hash-set! tab name