From 27be627fe4276a298a8757443af141025a2a0464 Mon Sep 17 00:00:00 2001 From: hanwen Date: Thu, 12 May 2005 14:25:41 +0000 Subject: [PATCH] * 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 --- ChangeLog | 7 +++++++ VERSION | 2 +- lily/align-interface.cc | 11 ++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25911ce9b6..ef54dedb29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-05-12 Han-Wen Nienhuys + + * 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 * flower/string.cc (substitute): Take two strings or two diff --git a/VERSION b/VERSION index 89752f449f..deb0b5d198 100644 --- 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 5ae726676f..59575bba43 100644 --- 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 (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"); -- 2.39.5