Release: update news.

[lilypond.git] / lily / stem-engraver.cc

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index ae5af1a3c451161d06ab0a823c0800ad4ee21d7e..e21d796765ccd1cc1de4daf188b18be068e82d48 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -135,26 +135,12 @@ Stem_engraver::acknowledge_rhythmic_head (Grob_info gi)
     make_stem (gi);
 
   int ds = Stem::duration_log (stem_);
-  int dc = d->duration_log ();
-
-  // half notes and quarter notes all have compatible stems.
-  // Longas are done differently (oops?), so we can't unify
-  // them with the other stemmed notes.
-  if (ds == 1)
-    ds = 2;
-  if (dc == 1)
-    dc = 2;
-  // whole notes and brevis both have no stems
-  if (ds == -1)
-    ds = 0;
-  if (dc == -1)
-    dc = 0;
-
-  if (ds != dc) 
+
+  if (ds != d->duration_log ())
     {
-      // FIXME: 
-      gi.event_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d)",
-                                                1 << Stem::duration_log (stem_)));
+      gi.event_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d/%d)",
+                                                ds < 0 ? 1 << -ds : 1,
+                                                ds > 0 ? 1 << ds : 1));
       gi.event_cause ()->origin ()->warning (_ ("maybe input should specify polyphonic voices"));
     }