From a45c61f32f0a148b502aa48a4f9e1042cf0f96f5 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 16 May 2002 15:33:46 +0000 Subject: [PATCH] '' --- ChangeLog | 3 +++ lily/lexer.ll | 3 ++- lily/score-engraver.cc | 10 +++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 264c4cddb2..5f25de75dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,9 @@ 2002-05-16 Han-Wen + * lily/score-engraver.cc (typeset_all): sanity check for items + that are Y parent to spanner. + * lily/piano-pedal-engraver.cc (create_bracket_grobs): fix broken pedal spanners. diff --git a/lily/lexer.ll b/lily/lexer.ll index 53d56e4dde..5d224403ca 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -640,7 +640,8 @@ strip_trailing_white (String&s) -Lilypond_version oldest_version ("1.4.0"); +/* 1.3.146 == removal of ; */ +Lilypond_version oldest_version ("1.3.146"); bool diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 8b4b4c7675..bd47e1fa27 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -163,10 +163,10 @@ Score_engraver::typeset_all () if (Spanner *s = dynamic_cast (elem_p)) { - /* + /* do something sensible if spanner not spanned on 2 items. - */ + */ Direction d = LEFT; do { if (!s->get_bound (d)) @@ -180,7 +180,11 @@ Score_engraver::typeset_all () else elem_p->warning (_f ("unbound spanner `%s'", s->name ().ch_C ())); } - } while (flip (&d) != LEFT); + } + while (flip (&d) != LEFT); + + if (dynamic_cast (s->get_parent (Y_AXIS))) + programming_error ("Spanner Y-parent is an item."); } else { -- 2.39.5