From c4c22c93b26b79512140d168acd6dc8f78ae7869 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 2 Mar 2006 00:12:05 +0000 Subject: [PATCH] (print): suicide if we don't have any elements. Fixes hara kiri'd instrument names. --- ChangeLog | 7 +++++++ lily/system-start-text.cc | 13 ++++++++++++- scripts/midi2ly.py | 4 +--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20ae573092..cf93e670e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-02 Han-Wen Nienhuys + + * lily/system-start-text.cc (print): suicide if we don't have any + elements. Fixes hara kiri'd instrument names. + + * scripts/mup2ly.py (Module): remove. + 2006-03-01 Han-Wen Nienhuys * Documentation/user/global.itely (A single music expression): diff --git a/lily/system-start-text.cc b/lily/system-start-text.cc index 1e7399409a..2bc4e507d6 100644 --- a/lily/system-start-text.cc +++ b/lily/system-start-text.cc @@ -56,7 +56,18 @@ System_start_text::print (SCM smob) { Spanner *me = unsmob_spanner (smob); - extract_grob_set (me, "elements", elts); + extract_grob_set (me, "elements", all_elts); + vector elts; + for (vsize i = 0; i < all_elts.size (); i++) + if (all_elts[i]->is_live ()) + elts.push_back (all_elts[i]); + + if (!elts.size ()) + { + me->suicide (); + return SCM_EOL; + } + Grob *common = common_refpoint_of_array (elts, me, Y_AXIS); Interval ext; diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py index 31ce07caaa..798f3efe41 100644 --- a/scripts/midi2ly.py +++ b/scripts/midi2ly.py @@ -56,8 +56,6 @@ for p in ['share', 'lib']: datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % p) sys.path.insert (0, datadir) -################################################################ - import midi import lilylib as ly @@ -114,7 +112,7 @@ Copyright (c) %s by %s ''' ( '2001--2006', _('Distributed under terms of the GNU General Public License.'), - _('It comes with NO WARRANTY.')) + _('It comes with NO WARRANTY.'))) def progress (s): -- 2.39.2