Merge with master

[lilypond.git] / lily / break-substitution.cc

diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index 0c1e996580e7ca3826b8371ab72c489daf2b1079..f283010303ae2be12956e40229d51d96661bcff1 100644 (file)
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -3,16 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdio>
 #include <cstdlib>
 using namespace std;
 
-#include "grob-array.hh"
 #include "item.hh"
 #include "system.hh"
+#include "grob-array.hh"
 
 static SCM break_criterion;
 void
@@ -322,6 +322,8 @@ Spanner::fast_substitute_grob_array (SCM sym,
 
   /*
     We store items on the left, spanners on the right in this vector.
+
+    FIXME: will not multithread.
   */
   static Substitution_entry *vec;
   static int vec_room;
@@ -397,7 +399,7 @@ Spanner::fast_substitute_grob_array (SCM sym,
       if (!unsmob_grob_array (newval))
        {
          newval = Grob_array::make_array ();
-         sc->internal_set_object (sym, newval);
+         sc->set_object (sym, newval);
        }
 
       Grob_array *new_array = unsmob_grob_array (newval);
@@ -500,14 +502,14 @@ Spanner::substitute_one_mutable_property (SCM sym,
            if (!unsmob_grob_array (newval))
              {
                newval = Grob_array::make_array ();
-               sc->internal_set_object (sym, newval);
+               sc->set_object (sym, newval);
              }
            substitute_grob_array (grob_array, unsmob_grob_array (newval));
          }
        else
          {
            SCM newval = do_break_substitution (val);
-           sc->internal_set_object (sym, newval);
+           sc->set_object (sym, newval);
          }
       }
 }