MusicXML: Fix invalid MusicXML files

[lilypond.git] / lily / part-combine-iterator.cc

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index 83944b9ddfb3afe988c461d50f72a0e632b13503..ac8b4c0682a03af00f9f413954336bcce98532ea 100644 (file)
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -25,14 +25,14 @@
 #include "music-sequence.hh"
 #include "warn.hh"
 
-typedef enum Outlet_type
+enum Outlet_type
   {
     CONTEXT_ONE, CONTEXT_TWO,
     CONTEXT_SHARED, CONTEXT_SOLO,
     CONTEXT_NULL, NUM_OUTLETS
   };
 
-static const char *outlet_names_[NUM_OUTLETS] = 
+static const char *outlet_names_[NUM_OUTLETS] =
   {"one", "two", "shared", "solo", "null"};
 
 class Part_combine_iterator : public Music_iterator
@@ -57,20 +57,20 @@ private:
   DECLARE_LISTENER (set_busy);
   bool busy_;
   bool notice_busy_;
-  
+
   bool try_process (Music_iterator *i, Moment m);
-  
+
   Music_iterator *first_iter_;
   Music_iterator *second_iter_;
   Moment start_moment_;
 
   SCM split_list_;
 
-  Stream_event *unisono_event_; 
+  Stream_event *unisono_event_;
   Stream_event *solo_one_event_;
   Stream_event *solo_two_event_;
-  Stream_event *mmrest_event_; 
-  
+  Stream_event *mmrest_event_;
+
   enum Status
     {
       APART,
@@ -201,7 +201,7 @@ Part_combine_iterator::chords_together ()
 void
 Part_combine_iterator::kill_mmrest (int in)
 {
-  
+
   if (!mmrest_event_)
     {
       mmrest_event_ = new Stream_event (ly_symbol2scm ("multi-measure-rest-event"));
@@ -290,7 +290,7 @@ Part_combine_iterator::unisono (bool silent)
              unisono_event_ = new Stream_event (ly_symbol2scm ("unisono-event"));
              unisono_event_->unprotect ();
            }
-         
+
 
          Context *out = (last_playing_ == SOLO2 ? second_iter_ : first_iter_)
            ->get_outlet ();
@@ -319,7 +319,7 @@ Part_combine_iterator::solo2 ()
              solo_two_event_ = new Stream_event (ly_symbol2scm ("solo-two-event"));
              solo_two_event_->unprotect ();
            }
-         
+
          second_iter_->get_outlet ()->event_source ()->broadcast (solo_two_event_);
          playing_state_ = SOLO2;
        }
@@ -367,6 +367,10 @@ Part_combine_iterator::construct_children ()
   set_context (two);
   second_iter_ = unsmob_iterator (get_iterator (unsmob_music (scm_cadr (lst))));
 
+
+  /* Mimic all settings of voiceOne/voiceTwo for the two separate voices...*/
+  /* FIXME: Is there any way to use the definition of \voiceOne/\voiceTwo
+            directly??? */
   char const *syms[]
     = {
     "Stem",
@@ -389,6 +393,17 @@ Part_combine_iterator::construct_children ()
       execute_pushpop_property (two, sym,
                                ly_symbol2scm ("direction"), scm_from_int (-1));
     }
+   /* Handle horizontal shifts for crossing notes */
+  execute_pushpop_property (one, ly_symbol2scm ("NoteColumn"),
+                                ly_symbol2scm ("horizontal-shift"), scm_from_int (0));
+  execute_pushpop_property (two, ly_symbol2scm ("NoteColumn"),
+                                ly_symbol2scm ("horizontal-shift"), scm_from_int (1));
+   /* Also handle MultiMeasureRest positions for voice 1/2 */
+  execute_pushpop_property (one, ly_symbol2scm ("MultiMeasureRest"),
+                                ly_symbol2scm ("staff-position"), scm_from_int (4));
+  execute_pushpop_property (two, ly_symbol2scm ("MultiMeasureRest"),
+                                ly_symbol2scm ("staff-position"), scm_from_int (-4));
+
 }
 
 IMPLEMENT_LISTENER (Part_combine_iterator, set_busy);
@@ -415,7 +430,7 @@ Part_combine_iterator::try_process (Music_iterator *i, Moment m)
   notice_busy_ = true;
 
   i->process (m);
-  
+
   notice_busy_ = false;
   return busy_;
 }