Move rehearsal marks, etc. to the top staff.

[lilypond.git] / lily / vertically-spaced-context-engraver.cc

diff --git a/lily/vertically-spaced-context-engraver.cc b/lily/vertically-spaced-context-engraver.cc
index 59aeee40d04c79b67c7dd19068624aa2db2f9fe4..bc64f1bc5ce3f66ff064dcbba76ba6c47eeefcf5 100644 (file)
--- a/lily/vertically-spaced-context-engraver.cc
+++ b/lily/vertically-spaced-context-engraver.cc
@@ -1,9 +1,10 @@
 /*
   vertically-spaced-contexts-engraver.cc -- implement Vertically_spaced_contexts_engraver
+  TODO: junk this, since we now determine spaceability using Page_layout_problem::is_spaceable.
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -23,7 +24,6 @@ private:
   Grob *system_;
 };
 
-
 Vertically_spaced_contexts_engraver::Vertically_spaced_contexts_engraver ()
 {
   system_ = 0;
@@ -43,12 +43,12 @@ Vertically_spaced_contexts_engraver::acknowledge_vertically_spaceable (Grob_info
       SCM spaceable = get_property ("verticallySpacedContexts");
       Context *orig = gi.origin_contexts (this)[0];
 
-      if (scm_memq (ly_symbol2scm (orig->context_name ().to_str0 ()),
+      if (scm_memq (ly_symbol2scm (orig->context_name ().c_str ()),
                    spaceable) != SCM_BOOL_F)
        {
-         Pointer_group_interface::add_grob (system_,
-                                            ly_symbol2scm ("spaceable-staves"),
-                                            gi.grob ());
+         Pointer_group_interface::add_unordered_grob (system_,
+                                                      ly_symbol2scm ("spaceable-staves"),
+                                                      gi.grob ());
        }
     }
 }
@@ -57,8 +57,15 @@ Vertically_spaced_contexts_engraver::acknowledge_vertically_spaceable (Grob_info
 
 ADD_ACKNOWLEDGER (Vertically_spaced_contexts_engraver, vertically_spaceable);
 ADD_TRANSLATOR (Vertically_spaced_contexts_engraver,
-               /* doc */ "",
-               /* create */ "",
-               /* accept */ "",
-               /* read */ "verticallySpacedContexts",
-               /* write */ "verticallySpacedContexts");
+               /* doc */
+               "",
+
+               /* create */
+               "",
+
+               /* read */
+               "verticallySpacedContexts ",
+
+               /* write */
+               "verticallySpacedContexts "
+               );