CG: add GOP questions about identifiers.

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 1d4313b17a2368c7ad0d02a36f1b20a4d0470c17..e21d796765ccd1cc1de4daf188b18be068e82d48 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -31,7 +31,7 @@
 #include "stem-tremolo.hh"
 #include "stem.hh"
 #include "stream-event.hh"
-#include "pointer-group-interface.hh"
+
 #include "translator.icc"
 
 class Stem_engraver : public Engraver
@@ -135,38 +135,15 @@ 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 ())
     {
-      ds = 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"));
-      if (ds == 1 && dc > 2) {
-       Grob *old_stem = stem_;
-       stem_=0;        
-       make_stem(gi);
-       extract_grob_set (old_stem, "note-heads", heads);
-       for (int i=heads.size(); i--;)
-         Stem::add_head(stem_, heads[i]);
-      }
     }
-  
+
   Stem::add_head (stem_, gi.grob ());
 }