From 210bd4a63a76a6c5ea2d6ea182b86e32c57600dc Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 17 Jul 2004 11:56:20 +0000 Subject: [PATCH] (set_end_points): handle broken slurs. Doesn't really work yet. (set_end_points): make X coord of attachment dependent on Y. (score_encompass): add edges too. --- lily/new-slur.cc | 6 +++++- po/lilypond.pot | 27 ++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/lily/new-slur.cc b/lily/new-slur.cc index 252e18b0d4..42c8d95756 100644 --- a/lily/new-slur.cc +++ b/lily/new-slur.cc @@ -576,7 +576,11 @@ New_slur::score_encompass (Grob * me, Grob *common[], Real attr = EDGE_ATTRACTION_FACTOR * fabs (scores->elem (i).attachment_[d][Y_AXIS] - base_attach[d][Y_AXIS]); - if (extremes[d].stem_ && extremes[d].stem_dir_ == dir) + + if (extremes[d].stem_ + && extremes[d].stem_dir_ == dir + && !Stem::get_beaming (extremes[d].stem_, -d) + ) attr /= 5; demerit += attr; diff --git a/po/lilypond.pot b/po/lilypond.pot index 3ab51af72b..563cdb76c0 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-07-17 12:58+0200\n" +"POT-Creation-Date: 2004-07-17 13:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -147,6 +147,8 @@ msgstr "" #. for --output-format. #. Bug in option parser: --output=foe is taken as an abbreviation #. for --output-format. +#. Bug in option parser: --output=foe is taken as an abbreviation +#. for --output-format. #: lilypond-book.py:82 old-lilypond-book.py:123 main.cc:138 lily/main.cc:125 msgid "EXT" msgstr "" @@ -744,6 +746,7 @@ msgstr "" #. FIXME: broken sentence #. FIXME: broken sentence #. FIXME: broken sentence +#. FIXME: broken sentence #: all-font-metrics.cc:100 lily/all-font-metrics.cc:95 #, c-format msgid "checksum mismatch for font file: `%s'" @@ -904,6 +907,12 @@ msgstr "" #. #. last->translator_id_string () = get_change ()->change_to_id_string (); #. +#. +#. We could change the current translator's id, but that would make +#. errors hard to catch +#. +#. last->translator_id_string () = get_change ()->change_to_id_string (); +#. #: change-iterator.cc:93 lily/change-iterator.cc:93 msgid "I'm one myself" msgstr "" @@ -1255,6 +1264,7 @@ msgstr "" #. No version number or newline here. It confuses help2man. #. No version number or newline here. It confuses help2man. #. No version number or newline here. It confuses help2man. +#. No version number or newline here. It confuses help2man. #: main.cc:196 lily/main.cc:181 #, c-format msgid "Usage: %s [OPTIONS]... FILE..." @@ -1382,6 +1392,9 @@ msgstr "" #. #. music for the softenon children? #. +#. +#. music for the softenon children? +#. #: new-fingering-engraver.cc:155 lily/new-fingering-engraver.cc:153 msgid "music for the martians." msgstr "" @@ -1584,6 +1597,7 @@ msgstr "" #. this shouldn't happen, but let's continue anyway. #. this shouldn't happen, but let's continue anyway. #. this shouldn't happen, but let's continue anyway. +#. this shouldn't happen, but let's continue anyway. #: separation-item.cc:53 separation-item.cc:97 lily/separation-item.cc:53 #: lily/separation-item.cc:97 msgid "Separation_item: I've been drinking too much" @@ -1618,6 +1632,8 @@ msgstr "" #. eaten start event? #. How to shut up this warning, when Voice_devnull_engraver has #. eaten start event? +#. How to shut up this warning, when Voice_devnull_engraver has +#. eaten start event? #: slur-engraver.cc:139 lily/slur-engraver.cc:139 msgid "can't find start of slur" msgstr "" @@ -1715,6 +1731,8 @@ msgstr "" #. more of a programming error. #. Not using ngettext's plural feature here, as this message is #. more of a programming error. +#. Not using ngettext's plural feature here, as this message is +#. more of a programming error. #: tfm-reader.cc:108 lily/tfm-reader.cc:108 #, c-format msgid "TFM header of `%s' has only %u word (s)" @@ -1753,6 +1771,8 @@ msgstr "" #. (Here really with a warning!) #. If there is no such symbol, we default to the numbered style. #. (Here really with a warning!) +#. If there is no such symbol, we default to the numbered style. +#. (Here really with a warning!) #: time-signature.cc:95 lily/time-signature.cc:95 #, c-format msgid "time signature symbol `%s' not found; reverting to numbered style" @@ -1808,6 +1828,11 @@ msgstr "" #. #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi. #. +#. +#. Todo: should make typecheck? +#. +#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi. +#. #: time-signature-engraver.cc:57 lily/time-signature-engraver.cc:57 #, c-format msgid "Found strange time signature %d/%d." -- 2.39.5