From: fred <fred>
Date: Tue, 26 Mar 2002 21:51:34 +0000 (+0000)
Subject: lilypond-1.1.7
X-Git-Tag: release/1.5.59~2344
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d90954d032e788f421409e0ca39ccef11060d7fa;p=lilypond.git

lilypond-1.1.7
---

diff --git a/lily/beam-swallow-trans.cc b/lily/beam-swallow-trans.cc
deleted file mode 100644
index cf7b4d1ef6..0000000000
--- a/lily/beam-swallow-trans.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-/*   
-  beam-swallow-trans.cc -- instantiate Beam_swallow_translator 
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "type-swallow-trans.hh"
-#include "musical-request.hh"
-
-DECLARE_REQUEST_SWALLOWER(Beam_req);
-
diff --git a/lily/include/voice-iterator.hh b/lily/include/voice-iterator.hh
deleted file mode 100644
index ce9613b3aa..0000000000
--- a/lily/include/voice-iterator.hh
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-  Sequential_music-iter.hh -- declare Sequential_music_iterator
-
-  source file of the GNU LilyPond music typesetter
-
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#ifndef Sequential_music_ITER_HH
-#define Sequential_music_ITER_HH
-
-
-#include "music-iterator.hh"
-#include "pcursor.hh"
-
-class Sequential_music_iterator :  public Music_iterator
-{
-  Moment here_mom_;
-  PCursor<Music*> *cursor_p_;
-  Music_iterator * iter_p_;
-  void start_next_element();
-  void leave_element();
-  void set_Sequential_music_translator();
-protected:
-  Sequential_music * sequential_music_l() const;
-public:
-  Sequential_music_iterator ();
-  
-protected:
-  virtual void do_print() const;
-  virtual void construct_children();
-  ~Sequential_music_iterator();    
-  virtual void do_process_and_next (Moment);
-  virtual Moment next_moment() const;
-  virtual bool ok() const;
-};
-
-#endif // Sequential_music_ITER_HH
diff --git a/lily/voice-iterator.cc b/lily/voice-iterator.cc
deleted file mode 100644
index a03c337664..0000000000
--- a/lily/voice-iterator.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-  Sequential_music-iter.cc -- implement Sequential_music_iterator
-
-  source file of the GNU LilyPond music typesetter
-
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#include "translator-group.hh"
-#include "debug.hh"
-#include "voice-iterator.hh"
-#include "music-list.hh"
-
-
-void
-Sequential_music_iterator::do_print() const
-{
-  if (iter_p_)
-    iter_p_->print();
-}
-
-Sequential_music_iterator::Sequential_music_iterator ()
-{
-  cursor_p_ = 0;
-  here_mom_ = 0;
-  iter_p_ =0;
-}
-
-Sequential_music*
-Sequential_music_iterator::sequential_music_l () const
-{
-  return (Sequential_music *)music_l_;
-}
-
-void
-Sequential_music_iterator::construct_children()
-{
-  cursor_p_ = new PCursor<Music*> (sequential_music_l ()->music_p_list_p_->top ());
-  
-  while (cursor_p_->ok()) 
-    {
-      start_next_element();
-      if (!iter_p_->ok()) 
-	{
-	  leave_element();
-	}
-      else 
-	{
-	  set_Sequential_music_translator();
-	  break;
-	}
-    }
-}
-
-void 
-Sequential_music_iterator::leave_element()
-{
-  delete iter_p_;
-  iter_p_ =0;
-  Moment elt_time = cursor_p_->ptr()->duration ();
-  here_mom_ += elt_time;
-  cursor_p_->next();
-}
-
-void
-Sequential_music_iterator::start_next_element()
-{
-  assert (!iter_p_);
-  iter_p_ = get_iterator_p ( cursor_p_->ptr());
-}
-
-void
-Sequential_music_iterator::set_Sequential_music_translator()
-{
-  if (iter_p_->report_to_l()->depth_i () > report_to_l ()->depth_i ())
-    set_translator (iter_p_->report_to_l());
-}
-
-Sequential_music_iterator::~Sequential_music_iterator()
-{
-  delete cursor_p_;
-  assert (! iter_p_);
-}
-
-
-
-
-void
-Sequential_music_iterator::do_process_and_next (Moment until)
-{
-  while (1) 
-    {
-      Moment local_until = until - here_mom_;
-      while (iter_p_->ok()) 
-	{
-	  Moment here = iter_p_->next_moment();
-	  if (here != local_until)
-	    goto loopexit;
-	    
-	  iter_p_->process_and_next (local_until);
-	}
-
-      if (!iter_p_->ok()) 
-	{
-	  leave_element();
-	  
-	  if (cursor_p_->ok()) 
-	    {
-	      start_next_element();
-	      set_Sequential_music_translator();
-	    }
-	  else 
-	    {
-	      goto loopexit;
-	    }
-	}
-    }
-
-loopexit:
-
-  Music_iterator::do_process_and_next (until);
-}
-
-Moment
-Sequential_music_iterator::next_moment() const
-{
-  return iter_p_->next_moment() + here_mom_;
-}
-
-bool
-Sequential_music_iterator::ok() const
-{
-  return iter_p_;
-}
-