lilypond-1.1.50

diff --git a/lily/new-repeated-music-iterator.cc b/lily/new-repeated-music-iterator.cc
deleted file mode 100644 (file)
index 0c168dd..0000000
--- a/lily/new-repeated-music-iterator.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-/*   
-  new-repeated-music-iterator.cc --  implement Folded_repeat_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "folded-repeat-iterator.hh"
-#include "new-repeated-music.hh"
-#include "music-list.hh"
-#include "simultaneous-music-iterator.hh"
-#include "translator-group.hh"
-
-Folded_repeat_iterator::Folded_repeat_iterator ()
-{
-  main_iter_p_ = 0;
-  alternative_iter_p_ = 0;
-}
-
-bool
-Folded_repeat_iterator::ok () const
-{
-  return main_iter_p_ || alternative_iter_p_;
-}
-
-Folded_repeat_iterator::~Folded_repeat_iterator ()
-{
-  delete main_iter_p_;
-  delete alternative_iter_p_;
-}
-
-Moment
-Folded_repeat_iterator::next_moment () const
-{
-  if (main_iter_p_)
-    {
-      return main_iter_p_->next_moment ();
-    }
-  else
-    return main_length_mom_ + alternative_iter_p_->next_moment ();
-}
-
-void
-Folded_repeat_iterator::construct_children ()
-{
-  New_repeated_music const *  mus = dynamic_cast<New_repeated_music const*> (music_l_);
-  main_iter_p_ = get_iterator_p (mus->repeat_body_p_);
-  if (!main_iter_p_->ok())
-    {
-      leave_body ();
-      enter_alternative ();
-    }
-}
-
-void
-Folded_repeat_iterator::do_process_and_next (Moment m)
-{
-  if (!m)
-    {
-      bool success = report_to_l ()->try_music (music_l_);
-      if (!success)
-       music_l_->warning ( _("No one to print a volta bracket"));
-    }
-  
-  New_repeated_music const * mus = dynamic_cast<New_repeated_music const*> (music_l_);
-  
-  if (main_iter_p_)
-    {
-      main_iter_p_->process_and_next (m);
-      if (!main_iter_p_->ok ())
-       leave_body ();
-    }
-
-  if (!main_iter_p_ && !alternative_iter_p_)
-    {
-      enter_alternative ();
-    }
-  
-  if (alternative_iter_p_)
-    {
-      alternative_iter_p_->process_and_next (m - main_length_mom_);
-      if (!alternative_iter_p_->ok ())
-       {
-         delete alternative_iter_p_;
-         alternative_iter_p_ =0;
-       }
-    }
-}
-
-void
-Folded_repeat_iterator::leave_body ()
-{
-  New_repeated_music const *  mus = dynamic_cast<New_repeated_music const*> (music_l_);
-  delete main_iter_p_;
-  main_iter_p_ = 0;
-  main_length_mom_ +=  mus->repeat_body_p_->length_mom ();
-}
-
-void
-Folded_repeat_iterator::enter_alternative ()
-{
-  New_repeated_music const *  mus = dynamic_cast<New_repeated_music const*> (music_l_);  
-  Simultaneous_music_iterator * s = new Simultaneous_music_iterator;
-  s->separate_contexts_b_ = true;
-  s->init_translator (mus->alternatives_p_, report_to_l ());
-  
-  alternative_iter_p_ = s;
-  alternative_iter_p_->construct_children ();
-}
-
-void
-Folded_repeat_iterator::do_print () const
-{
-#ifndef NPRINT
-#endif
-}

diff --git a/lily/new-repeated-music.cc b/lily/new-repeated-music.cc
deleted file mode 100644 (file)
index 15bd06f..0000000
--- a/lily/new-repeated-music.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-/*   
-  new-repeated-music.cc --  implement New_repeated_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "new-repeated-music.hh"
-#include "music-list.hh"
-#include "musical-pitch.hh"
-#include "debug.hh"
-
-New_repeated_music::New_repeated_music(Music *beg, int times, Music_sequence * alts)
-{
-  repeat_body_p_ = beg;
-  fold_b_ = false;
-  repeats_i_ = times;
-  alternatives_p_ = alts;
-  semi_fold_b_ = true;
-}
-
-New_repeated_music::New_repeated_music (New_repeated_music const &s)
-  : Music (s)
-{
-  repeats_i_ = s.repeats_i_;
-  fold_b_ = s.fold_b_;
-  semi_fold_b_ = s.semi_fold_b_;
-  
-  repeat_body_p_ = s.repeat_body_p_ ? s.repeat_body_p_->clone () : 0;
-  alternatives_p_ = s.alternatives_p_
-    ? dynamic_cast<Music_sequence*> (s.alternatives_p_->clone ()):0;
-}
-
-New_repeated_music::~New_repeated_music ()
-{
-  delete repeat_body_p_;
-  delete alternatives_p_;
-}
-
-void
-New_repeated_music::do_print () const
-{
-#ifndef NPRINT
-  DOUT << "Fold = " << fold_b_ << " reps: " << repeats_i_;
-
-  if (repeat_body_p_)
-    repeat_body_p_->print();
-  
-  if (alternatives_p_)
-    alternatives_p_->print();
-#endif
-}
-
-Musical_pitch
-New_repeated_music::to_relative_octave (Musical_pitch p)
-{
-  if (repeat_body_p_)
-    p = repeat_body_p_->to_relative_octave (p);
-
-  if (alternatives_p_)
-    p = alternatives_p_->do_relative_octave (p, true);
-  return p;
-}
-
-
-void
-New_repeated_music::transpose (Musical_pitch p)
-{
-  if (repeat_body_p_)
-    repeat_body_p_->transpose (p);
-
-  if (alternatives_p_)
-    alternatives_p_->transpose (p);  
-}
-
-void
-New_repeated_music::compress (Moment p)
-{
-  if (repeat_body_p_)
-    repeat_body_p_->compress (p);
-
-  if (alternatives_p_)
-    alternatives_p_->compress (p);  
-}
-
-Moment
-New_repeated_music::alternatives_length_mom () const
-{
-  if (alternatives_p_)
-    {
-      return  (fold_b_)
-       ? alternatives_p_->maximum_length ()
-       : alternatives_p_->cumulative_length ();
-    }
-  return 0; 
-}
-
-Moment
-New_repeated_music::length_mom () const
-{
-  Moment m =0;
-  if (fold_b_)
-    {
-      if (repeat_body_p_)
-       m += repeat_body_p_->length_mom ();
-    }
-  else
-    {
-      Moment beg = (repeat_body_p_) ? repeat_body_p_->length_mom () : Rational(0);
-      if (!semi_fold_b_)
-       beg *=  Rational (repeats_i_);
-      m += beg;
-    }
-
-  m += alternatives_length_mom ();
-  return m;
-}
-