(internal_set_property): don't abort on

calculation-in-progress.

diff --git a/ChangeLog b/ChangeLog
index 4b5e9b57a0314161e18184c6573b548412afce74..8cc4287df15b0e6ece5a83ebd7b24aca8679d878 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/grob-property.cc (internal_set_property): don't abort on
+       calculation-in-progress.
+
        * lily/beam.cc (get_default_dir): robustness: don't divide by zero.
 
        * lily/tuplet-bracket.cc (calc_control_points): oops: typo. Read

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 8c68171fa92eaae76f688c8286c475f0384eb4f4..c4dce927b43f86f3265348779ede3ef846f6b1b9 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -55,6 +55,7 @@ Grob::internal_set_property (SCM sym, SCM v)
     {
       if (!ly_is_procedure (v)
          && !is_simple_closure (v)
+         && v != ly_symbol2scm ("calculation-in-progress") 
          && !type_check_assignment (sym, v, ly_symbol2scm ("backend-type?")))
        abort ();
       check_interfaces_for_property (this, sym);