CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/12 14:25:41
Modified files:
. : ChangeLog VERSION
lily : align-interface.cc
Log message:
* 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
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3602&tr2=1.3603&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/VERSION.diff?tr1=1.634&tr2=1.635&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/align-interface.cc.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3602 lilypond/ChangeLog:1.3603
--- lilypond/ChangeLog:1.3602 Thu May 12 12:08:08 2005
+++ lilypond/ChangeLog Thu May 12 14:25:41 2005
@@ -1,3 +1,10 @@
+2005-05-12 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* flower/string.cc (substitute): Take two strings or two
Index: lilypond/VERSION
diff -u lilypond/VERSION:1.634 lilypond/VERSION:1.635
--- lilypond/VERSION:1.634 Fri May 6 14:31:18 2005
+++ lilypond/VERSION Thu May 12 14:25:41 2005
@@ -1,6 +1,6 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=5
-PATCH_LEVEL=24
+PATCH_LEVEL=25
MY_PATCH_LEVEL=
Index: lilypond/lily/align-interface.cc
diff -u lilypond/lily/align-interface.cc:1.75
lilypond/lily/align-interface.cc:1.76
--- lilypond/lily/align-interface.cc:1.75 Sun May 8 23:17:49 2005
+++ lilypond/lily/align-interface.cc Thu May 12 14:25:41 2005
@@ -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 @@
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");
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
