(Lyric_combine_music_iterator): remove superfluous events.

(melisma_busy): new function.

diff --git a/ChangeLog b/ChangeLog
index df191ebfcabbdc105cf27a99e62986063291c008..faacac1f7ee02de69abc61a6dfb7766d23f0d4f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/lyric-combine-music-iterator.cc
+       (Lyric_combine_music_iterator): remove superfluous events.
+       (melisma_busy): new function.
+
 2002-10-31  Heikki Junes  <hjunes@cc.hut.fi>
 
        * vimrc: Add shortcuts for compiling, midi-playing and PS-viewing.
@@ -55,6 +61,8 @@
 
 2002-10-28  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * VERSION: 1.7.5 released
+
        * input/regression/finger-chords.ly (texidoc): new file.
 
        * lily/script-engraver.cc (process_music): remove scriptHorizontal

diff --git a/VERSION b/VERSION
index df4ced4ab532fe7c68bd40e8c3d550bbf8bcbf1a..ec9b80877670e1f2f47bda574075a8ef2e0081f9 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=7
-PATCH_LEVEL=5
+PATCH_LEVEL=6
 MY_PATCH_LEVEL=
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/lily/include/lyric-combine-music-iterator.hh b/lily/include/lyric-combine-music-iterator.hh
deleted file mode 100644 (file)
index e85fc6a..0000000
--- a/lily/include/lyric-combine-music-iterator.hh
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/*   
-  lyric-combine-music-iterator.hh -- declare Lyric_combine_music_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#ifndef LYRIC_COMBINE_MUSIC_ITERATOR_HH
-#define LYRIC_COMBINE_MUSIC_ITERATOR_HH
-
-#include "music-iterator.hh"
-
-class Lyric_combine_music_iterator : public Music_iterator
-{
-public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  Lyric_combine_music_iterator ();
-  Lyric_combine_music_iterator (Lyric_combine_music_iterator const&src);
-  DECLARE_SCHEME_CALLBACK(constructor, ());
-protected:
-  virtual void construct_children ();
-  virtual Moment pending_moment () const;
-  virtual void do_quit(); 
-  virtual void process (Moment);
-  virtual Music_iterator *try_music_in_children (Music *) const;
-  
-  virtual bool ok () const;
-  virtual void derived_mark () const;
-private:
-  bool get_busy_status ()const ;
-  Music_iterator * music_iter_;
-  Music_iterator * lyric_iter_;
-};
-#endif /* LYRIC_COMBINE_MUSIC_ITERATOR_HH */
-

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 77d12d4563c2252b161573849701de744596a3b3..eda58927710434936de1873cf9d9c54660f358d3 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -8,19 +8,43 @@
  */
 
 #include "translator-group.hh"
-#include "lyric-combine-music-iterator.hh"
 #include "lyric-combine-music.hh"
 #include "event.hh"
 #include "note-head.hh"
 #include "grob.hh"
+#include "music-iterator.hh"
+
+class Lyric_combine_music_iterator : public Music_iterator
+{
+public:
+  VIRTUAL_COPY_CONS (Music_iterator);
+  Lyric_combine_music_iterator ();
+  Lyric_combine_music_iterator (Lyric_combine_music_iterator const&src);
+  DECLARE_SCHEME_CALLBACK(constructor, ());
+protected:
+  virtual void construct_children ();
+  virtual Moment pending_moment () const;
+  virtual void do_quit(); 
+  virtual void process (Moment);
+  virtual Music_iterator *try_music_in_children (Music *) const;
+
+  virtual bool ok () const;
+  virtual void derived_mark () const;
+private:
+  bool get_busy_status ()const ;
+  bool  melisma_busy (); 
+  
+
+  Music_iterator * music_iter_;
+  Music_iterator * lyric_iter_;
+};
+
 
 
 /*
   Ugh, why static?
  */
 Music *busy_req;
-Music *melisma_start_req;
-Music *melisma_stop_req;
 Music *melisma_playing_req;
 
 Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
@@ -31,13 +55,6 @@ Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
        = make_music_by_name (ly_symbol2scm ("BusyPlayingEvent"));
       melisma_playing_req
        = make_music_by_name (ly_symbol2scm ("MelismaPlayingEvent"));
-      melisma_stop_req
-       = make_music_by_name (ly_symbol2scm ("MelismaEvent"));
-      melisma_start_req
-       = make_music_by_name (ly_symbol2scm ("MelismaEvent"));
-
-      melisma_start_req->set_mus_property ("span-direction", gh_int2scm (START));
-      melisma_stop_req->set_mus_property ("span-direction", gh_int2scm (STOP));
     }
   
   music_iter_ =0;
@@ -106,6 +123,33 @@ Lyric_combine_music_iterator::get_busy_status () const
   return false;
 }
 
+
+bool
+Lyric_combine_music_iterator::melisma_busy ()
+{
+#if 0
+  
+  Translator_group * trg = music_iter_->report_to();
+  bool melisma_busy= to_boolean (trg->get_property ("melismaBusy"));
+
+  melisma_busy = melisma_busy ||  to_boolean (trg->get_property ("slurMelismaBusy"));
+  melisma_busy = melisma_busy ||  to_boolean (trg->get_property ("tieMelismaBusy"));
+  melisma_busy = melisma_busy ||  to_boolean (trg->get_property ("beamMelismaBusy"));
+  return melisma_busy;
+
+#else
+
+  /*
+    The above code is nicer since it doesn't rely on a special
+    engraver to signal the melisma status. Unfortunately,
+    music_iter_->report_to() might not be the context that sets the
+    melisma properties, but rather a parent context.
+   */
+  return  music_iter_->try_music (melisma_playing_req);
+#endif
+  
+}
+
 void
 Lyric_combine_music_iterator::process (Moment m)
 {
@@ -115,20 +159,13 @@ Lyric_combine_music_iterator::process (Moment m)
   
   music_iter_->process (m);
 
-  if (get_busy_status ())
+  if (get_busy_status () && !melisma_busy () && lyric_iter_->ok ())
     {
-      bool melisma_b = try_music (melisma_playing_req);
-      if (!melisma_b)
-       {
-         if (lyric_iter_->ok ())
-           {
-             Moment m= lyric_iter_->pending_moment ();
-             lyric_iter_->process (m);
-           }
-       }
+      Moment m= lyric_iter_->pending_moment ();
+      lyric_iter_->process (m);
     }
-  
 }
+
 void
 Lyric_combine_music_iterator::do_quit ()
 {

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 8edc61903f04e345a4ae48eaf178e98b695cc8a3..cb77d13c1eafc71ae6f9f694c9c78025dff3a66e 100644 (file)
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -8,7 +8,6 @@
  */
 
 #include "lyric-combine-music.hh"
-#include "lyric-combine-music-iterator.hh"
 #include "pitch.hh"
 
 Lyric_combine_music::Lyric_combine_music ()

diff --git a/lily/melisma-engraver.cc b/lily/melisma-engraver.cc
index 4da8b4a5cfd323c4a6173c97526f75921c16eff9..4ef620c7118878bc98474651f3555a4d8a66ed81 100644 (file)
--- a/lily/melisma-engraver.cc
+++ b/lily/melisma-engraver.cc
@@ -62,4 +62,4 @@ ENTER_DESCRIPTION(Melisma_engraver,
 /* accepts */     "melisma-playing-event",
 /* acks  */      "",
 /* reads */       "melismaBusy slurMelismaBusy tieMelismaBusy beamMelismaBusy",
-/* write */       "");
+/* write */       "melismaEngraverBusy");

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 0e5404b9a994e4ed58f4dcb2c72565eada5cd135..15d3aa97f40f471ff5f4624276e0191bafb29168 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -58,15 +58,22 @@ New_fingering_engraver::acknowledge_grob (Grob_info inf)
        {
          Music * m = unsmob_music (gh_car (s));
 
-         if (m && m->is_mus_type ("fingering-event"))
+         if (!m)
+           continue;
+         
+
+         if (m->is_mus_type ("fingering-event"))
            {
              add_fingering (inf.grob_ , m, note_ev);
            }
+         else if (m->is_mus_type ("script-event"))
+           {
+
+           }
        }
     }
 }
 
-
 void
 New_fingering_engraver::add_fingering (Grob * head,
                                       Music * event,
@@ -126,10 +133,7 @@ New_fingering_engraver::position_scripts ()
       fingerings_[i].position_ = gh_scm2int (fingerings_[i].head_ -> get_grob_property( "staff-position"));
     }
   
-
-  
   Array<Finger_tuple> up, down, horiz;
-
   for (int i = fingerings_.size(); i--;)
     {
       SCM d = fingerings_[i].finger_event_->get_mus_property ("direction");

diff --git a/scm/music-types.scm b/scm/music-types.scm
index 7746ca4cf9661332e25a7fe6db760fbd26b83474..e87a13b659777908873d6bc02487d6397a518e75 100644 (file)
--- a/scm/music-types.scm
+++ b/scm/music-types.scm
@@ -191,20 +191,12 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
 
        (internal-class-name . "Event")
        (types . (general-music mark-event event))
-       ))  
-    (MelismaEvent
-     . (
-       (description .  "")
-
-       (internal-class-name . "Event")
-       (types . (general-music span-event melisma-playing-event event))
-       )) 
+       ))
     (MelismaPlayingEvent
      . (
        (description .  "")
-
        (internal-class-name . "Event")
-       (types . (general-music event))
+       (types . (general-music melisma-playing-event event))
        ))
     (MultiMeasureRestEvent
      . (

diff --git a/scm/script.scm b/scm/script.scm
index 8fde1da2800f4a4ceb060a20d3b418414919321f..058f03aefd65eecec43db595e6f38e4841a47ad9 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -53,9 +53,6 @@
       default-script-alist)
       )
 
-
-
-
 (set! default-script-alist
       (append 
       '(("accDiscant" . ((accordion "Discant" "") #f 0 1 0))
@@ -97,7 +94,6 @@
        ("accStdbaseTFE" . ((accordion "Stdbase" "TFE") #f 0 -1 0))
        ("accStdbaseMES" . ((accordion "Stdbase" "MES") #f 0 -1 0))
        ("accStdbaseTFMES" . ((accordion "Stdbase" "TFMES") #f 0 -1 0))
-
        ("accSB" . ((accordion "SB" "") #f 0 -1 0))
        ("accBB" . ((accordion "BB" "") #f 0 -1 0))
        ("accOldEE" . ((accordion "OldEE" "") #f 0 -1 0))