* lily/align-interface.cc (align_elements_to_extents): warn if

called too early. Fixes: disappearing-staff-lines.ly

* VERSION (PACKAGE_NAME): release 2.5.24

diff --git a/ChangeLog b/ChangeLog
index 25911ce9b6eac12d3a5f982f3d99c90f25cc24eb..ef54dedb2978487c0f1ac787a5d97a1044baadb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-12  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/align-interface.cc (align_elements_to_extents): warn if
+       called too early. Fixes: disappearing-staff-lines.ly
+
+       * VERSION (PACKAGE_NAME): release 2.5.24
+
 2005-05-12  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * flower/string.cc (substitute): Take two strings or two

diff --git a/VERSION b/VERSION
index 89752f449fe7813e7c08f5799c5bf9b56fa52619..deb0b5d1986563adc0116413892a57a65aff5c48 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=5
-PATCH_LEVEL=24
+PATCH_LEVEL=25
 MY_PATCH_LEVEL=
 

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 5ae726676f107494fa5ff3b2a94d7ea64ede8ee8..59575bba43fdd4cd02bfd6525ce1d6b7b9a21907 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -8,9 +8,10 @@
 
 #include "align-interface.hh"
 
+#include "spanner.hh"
+#include "item.hh"
 #include "axis-group-interface.hh"
 #include "hara-kiri-group-spanner.hh"
-#include "output-def.hh"
 
 MAKE_SCHEME_CALLBACK (Align_interface, alignment_callback, 2);
 SCM
@@ -118,6 +119,14 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a)
 void
 Align_interface::align_elements_to_extents (Grob *me, Axis a)
 {
+  Spanner *me_spanner = dynamic_cast<Spanner *> (me);
+  if (a == Y_AXIS
+      && me_spanner
+      && me_spanner->get_bound (LEFT)->break_status_dir () == CENTER)
+    {
+      me_spanner->warning (_("vertical alignment called before line-breaking. Only do cross-staff spanners with PianoStaff."));
+    }
+  
   me->set_property ("positioning-done", SCM_BOOL_T);
 
   SCM d = me->get_property ("stacking-dir");