From 14cd894be85f3d6cb5e250605f8e90403d16ea71 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 26 Aug 2004 18:49:26 +0000 Subject: [PATCH] (try_music): ignore slurs_. Otherwise we get spurious messages with skipTypesetting on. --- ChangeLog | 8 +++++++- flower/include/offset.hh | 18 +++++++++++++----- lily/slur-engraver.cc | 6 ------ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index f317faf05c..0e2a2fb825 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-08-26 Han-Wen Nienhuys + + * lily/slur-engraver.cc (try_music): ignore slurs_. Otherwise we + get spurious messages with skipTypesetting on. + 2004-08-25 Graham Percival * Documentation/user/lilypond-book.itely: slight clean-up. @@ -29,7 +34,8 @@ * lily/slur-engraver.cc (finalize): read inside-slur property. - * scm/lily.scm (postscript->png): use ~a iso. ~s + * scm/lily.scm (postscript->png): use ~a iso. ~s in progress + message. * ly/property-init.ly (unHideNotes): hide accidentals at staff level. Fixes: hideNotes-accidental.ly diff --git a/flower/include/offset.hh b/flower/include/offset.hh index 8c57c3de29..ccf64ea784 100644 --- a/flower/include/offset.hh +++ b/flower/include/offset.hh @@ -18,10 +18,12 @@ Offset complex_divide (Offset, Offset); Offset complex_exp (Offset); -/** 2d vector - should change to Complex -- how is vector == complex? +/* + +This is a mixture a 2D vector. Sometimes it can +also be convenient to think of 2D vectors as complex numbers +(ie. x + i y). The naming of some methods reflects that. - ughr wat een beerput */ class Offset { @@ -100,10 +102,9 @@ public: Real arg () const; Real length () const; - //wtf, How is Offset a Complex? is this used? Offset operator *= (Offset z2) { - *this = complex_multiply (*this,z2); + *this = complex_multiply (*this, z2); return *this; } @@ -134,6 +135,13 @@ mirror (Offset o, Axis a) return o; } +inline +Real +dot_product (Offset o1, Offset o2) +{ + return o1[X_AXIS] * o2[X_AXIS] + o1[Y_AXIS] * o2[Y_AXIS]; +} + #endif /* OFFSET_HH */ diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index b596b952ac..76480c3936 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -49,9 +49,6 @@ Slur_engraver::try_music (Music *m) { if (m->is_mus_type ("slur-event")) { - /* - Let's not start more than one slur per moment. - */ Direction d = to_dir (m->get_property ("span-direction")); if (d == START) { @@ -60,9 +57,6 @@ Slur_engraver::try_music (Music *m) } else if (d == STOP) { - if (slurs_.is_empty ()) - return false; - events_[STOP] = m; return true; } -- 2.39.2