X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusical-request.cc;h=cdcda7ac0160ae4c634aa92163c461e23d9a774b;hb=5aff48d7a9c07e8c79a3c792ce4d034a127e3beb;hp=f5748139270c4e012e43b92124cc42c0e426733e;hpb=439b9eae8f830918d62c7374d4f72a1079334316;p=lilypond.git

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index f574813927..cdcda7ac01 100644
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -3,472 +3,192 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "musical-request.hh"
 #include "misc.hh"
 #include "debug.hh"
-#include "script-def.hh"
-#include "text-def.hh"
 #include "music-list.hh"
 
-
-
-IMPLEMENT_IS_TYPE_B1(Musical_req,Request);
-void
-Musical_req::do_print() const{}
-void
-Tie_req::do_print() const{}
-
-
-/* *************** */
-   
-
-
-
-IMPLEMENT_IS_TYPE_B1(Span_req,Musical_req);
-
-void
-Span_req::do_print() const    
-{
-#ifndef NPRINT
-  DOUT << spantype ;
-#endif
-}
-
-IMPLEMENT_IS_TYPE_B1(Spacing_req,Request);
-
-Spacing_req::Spacing_req()
-{
-  next = 0;
-  distance = 0;
-  strength = 0;
-}
-
 void
-Spacing_req::do_print() const
+Span_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "next " << next << "dist " << distance << "strength\n";
+  DEBUG_OUT << span_dir_;
 #endif
 }
 
-IMPLEMENT_IS_TYPE_B1 (Abbreviation_req, Musical_req);
-
-Abbreviation_req::Abbreviation_req ()
+Tremolo_req::Tremolo_req ()
 {
   type_i_ = 0;
 }
 
 void
-Abbreviation_req::do_print() const
+Tremolo_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "type " << type_i_ << "\n";
+  DEBUG_OUT << "type " << type_i_ << '\n';
 #endif
 }
 
-
-IMPLEMENT_IS_TYPE_B2(Blank_req,Spacing_req,Rhythmic_req);
-
 void
-Blank_req::do_print() const
-{
-  Spacing_req::do_print();
-}
-/* *************** */
-
-Melodic_req::Melodic_req()
+Melodic_req::transpose (Musical_pitch delta)
 {
-  notename_i_ = 0;
-  octave_i_ = 0;
-  accidental_i_ = 0;
-}
-
-void
-Melodic_req::transpose (Melodic_req const & delta)
-{
-  int old_pitch = pitch();
-  int delta_pitch = delta.pitch();
-  octave_i_ += delta.octave_i_;
-  notename_i_ += delta.notename_i_;
-  while  (notename_i_ >= 7) 
-    {
-	notename_i_ -= 7;
-	octave_i_ ++;
-    }
-
-  int new_pitch = pitch();
-  int delta_acc = new_pitch - old_pitch - delta_pitch;
+  pitch_.transpose (delta);
   
-  accidental_i_ -= delta_acc;
-  if (abs (accidental_i_) > 2) 
+  if (abs (pitch_.accidental_i_) > 2)
     {
-	delta.warning ("transposition makes accidental larger than 2");
+	warning (_f ("Transposition by %s makes accidental larger than two",
+	  delta.str ()));
     }
 }
 
-IMPLEMENT_IS_TYPE_B1(Melodic_req,Musical_req);
+
 
 bool
-Melodic_req::do_equal_b (Request*r) const
+Melodic_req::do_equal_b (Request const* r) const
 {
-  Melodic_req* m= r->musical()->melodic ();
-  return !compare (*m, *this);
+  Melodic_req const* m= dynamic_cast <Melodic_req const*> (r);
+  return m&& !compare (*m, *this);
 }
 
 int
 Melodic_req::compare (Melodic_req const &m1 , Melodic_req const&m2)
 {
-  int o=  m1.octave_i_ - m2.octave_i_;
-  int n = m1.notename_i_ - m2.notename_i_;
-  int a = m1.accidental_i_ - m2.accidental_i_;
-  
-  if (o)
-	return o;
-  if (n)
-	return n;
-  if (a)
-	return a;
-  return 0;
+  return Musical_pitch::compare (m1.pitch_, m2.pitch_);
 }
 
 void
-Melodic_req::do_print() const
+Melodic_req::do_print () const
 {
-#ifndef NPRINT
-  DOUT << "notename: " << notename_i_ 
-	 << " acc: " <<accidental_i_<<" oct: "<< octave_i_;
-#endif
+  pitch_.print ();
 }
 
-int
-Melodic_req::height() const
-{
-  return  notename_i_ + octave_i_*7;
-}
 
-/*
-  should be settable from input to allow "viola"-mode
- */
-static Byte pitch_byte_a[  ] = { 0, 2, 4, 5, 7, 9, 11 };	
 
-int
-Melodic_req::pitch() const
-{
-  return  pitch_byte_a[ notename_i_ % 7 ] + accidental_i_ + octave_i_ * 12;
-}
 
-/* *************** */
 int
 Rhythmic_req::compare (Rhythmic_req const &r1, Rhythmic_req const &r2)
 {
-  return (r1.duration() - r2.duration ());
+  return (r1.length_mom () - r2.length_mom ());
 }
 
 bool
-Rhythmic_req::do_equal_b (Request*r) const
+Rhythmic_req::do_equal_b (Request const* r) const
 {
-  Rhythmic_req* rh = r->musical()->rhythmic ();
+  Rhythmic_req const* rh = dynamic_cast <Rhythmic_req const*> (r);
 
-  return !compare (*this, *rh);
+  return rh && !compare (*this, *rh);
 }
 
 void
-Rhythmic_req::set_duration (Duration d)
-{
-  duration_ = d;
-}
-
-Rhythmic_req::Rhythmic_req()
-{
-}
-
-
-IMPLEMENT_IS_TYPE_B1(Rhythmic_req,Musical_req);
-
-void
-Rhythmic_req::do_print() const
+Rhythmic_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "duration { " <<duration_.str() << "}";
+  DEBUG_OUT << "duration { " <<duration_.str () << "}";
 #endif
 }
 
 
 Moment
-Rhythmic_req::duration() const {    
-  return duration_.length();
-}
-/* *************** */
-
-Lyric_req::Lyric_req (Text_def* def_p)
-  :Text_req (0, def_p)
+Rhythmic_req::length_mom () const
 {
-  def_p->align_i_ = 0;	// centre
-  dir_ = DOWN;		// lyrics below (invisible) staff
+  return duration_.length_mom ();
 }
 
-
-IMPLEMENT_IS_TYPE_B2(Lyric_req,Musical_req,Rhythmic_req);
-
 void
-Lyric_req::do_print() const
-{    
-  Rhythmic_req::do_print();
-  Text_req::do_print();
-}
-
-/* *************** */
-bool
-Note_req::do_equal_b (Request*r) const
-{
-  return Rhythmic_req::do_equal_b (r) && Melodic_req::do_equal_b (r);
-}
-
-
-Note_req::Note_req()
+Rhythmic_req::compress (Moment m)
 {
-  forceacc_b_ = false;
+  duration_.compress (m);
 }
 
-IMPLEMENT_IS_TYPE_B2(Note_req,Melodic_req,Rhythmic_req);
-
 void
-Note_req::do_print() const
+Lyric_req::do_print () const
 {
 #ifndef NPRINT
-  Melodic_req::do_print();
-  if (forceacc_b_) 
-    {
-	DOUT << " force accidental\n";
-    }
-  Rhythmic_req::do_print();
+  Rhythmic_req::do_print ();
+  DEBUG_OUT <<  "text = " << text_str_;
 #endif
 }
-/* *************** */
-
-IMPLEMENT_IS_TYPE_B1(Rest_req,Rhythmic_req);
-
-void
-Rest_req::do_print() const
-{
-      Rhythmic_req::do_print();
-}
-
-/* *************** */
-
-IMPLEMENT_IS_TYPE_B1(Beam_req,Span_req);
-
-Beam_req::Beam_req()
-{
-  nplet = 0;
-}
-
-void
-Beam_req::do_print() const
-{
-}
-
-/* *************** */
-
-IMPLEMENT_IS_TYPE_B1 (Abbreviation_beam_req, Span_req);
-
-Abbreviation_beam_req::Abbreviation_beam_req ()
-{
-  type_i_ = 0;
-}
-
-void
-Abbreviation_beam_req::do_print () const
-{
-}
-
-IMPLEMENT_IS_TYPE_B1(Slur_req,Span_req);
-
-void
-Slur_req::do_print() const
-{
-}
 
-/* *************** */
 
 bool
-Span_req:: do_equal_b (Request*r) const
+Note_req::do_equal_b (Request const* r) const
 {
-  Span_req * s = r->span();
-  return spantype - s->spantype;
+  Note_req const* n = dynamic_cast<Note_req const*> (r);
+  return n&& Rhythmic_req::do_equal_b (n) && Melodic_req::do_equal_b (n);
 }
 
-Span_req::Span_req()
-{
-  spantype = NOSPAN;
-}
 
-/* *************** */
-Script_req::Script_req (Script_req const&s)
+Note_req::Note_req ()
 {
-  dir_ = s.dir_;
-  scriptdef_p_ = s.scriptdef_p_ ? s.scriptdef_p_->clone() : 0;
-}
-
-/*
-  don't check dirs?
-  
-  (d1.dir_ == d2.dir_)
- */
-bool
-Script_req::do_equal_b (Request*r) const
-{
-  Script_req * s = r->script();
-  
-  return  scriptdef_p_->equal_b (*s->scriptdef_p_);
-}
-
-Script_req::Script_req()
-{
-  dir_ = CENTER;
-  scriptdef_p_ = 0;
+  cautionary_b_ = false;
+  forceacc_b_ = false;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Script_req,Request);
 
 void
-Script_req::do_print() const
+Note_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << " dir " << dir_ ;
-  scriptdef_p_->print();
+  Melodic_req::do_print ();
+  if (cautionary_b_)
+    {
+	DEBUG_OUT << " force cautionary accidental\n";
+    }
+  else if (forceacc_b_)
+    {
+	DEBUG_OUT << " force accidental\n";
+    }
+  Rhythmic_req::do_print ();
 #endif
 }
 
-void
-Musical_script_req::do_print() const
-{
-  Script_req::do_print();
-}
-
 
-IMPLEMENT_IS_TYPE_B2(Musical_script_req,Musical_req, Script_req);
-
-
-Script_req::~Script_req()
-{
-  delete scriptdef_p_;
-}
-/* *************** */
-
-
-Text_req::~Text_req()
-{
-  delete tdef_p_;
-  tdef_p_ = 0;
-}
-
-Text_req::Text_req (Text_req const& src)
-{
-  tdef_p_ = new Text_def (*src.tdef_p_);
-  dir_ = src.dir_;
-}
-
-Text_req::Text_req (int dir_i, Text_def* tdef_p)	
+bool
+Span_req::do_equal_b (Request const*r) const
 {
-  dir_ = Direction(dir_i);
-  tdef_p_ = tdef_p;
+  Span_req const* s = dynamic_cast <Span_req const*> (r);
+  return s && span_dir_ == s->span_dir_;
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Text_req,Musical_req);
-
-void
-Text_req::do_print() const
+Span_req::Span_req ()
 {
-#ifndef NPRINT
-  DOUT << " dir " << dir_ ;
-  tdef_p_->print();
-#endif
+  span_dir_ = CENTER;
 }
 
-/* *************** */
-
-
-IMPLEMENT_IS_TYPE_B1(Skip_req,Musical_req);
-
 void
-Skip_req::do_print() const
+Text_script_req::do_print () const
 {
-#ifndef NPRINT
-
-  DOUT << "duration: " << duration();
-#endif
+  DEBUG_OUT << "text" << text_str_
+       << ", style = " << style_str_;
 }
 
-
-
-IMPLEMENT_IS_TYPE_B1(Dynamic_req,Musical_req);
-
-void
-Dynamic_req::do_print() const
+bool
+Text_script_req::do_equal_b (Request const* r) const
 {
-  Musical_req::do_print();
+  Text_script_req const* t  = dynamic_cast<Text_script_req const*> (r);
+  return t && t->text_str_ == text_str_ && t->style_str_ == style_str_;
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Absolute_dynamic_req,Musical_req);
-
 void
-Absolute_dynamic_req::do_print() const
+Articulation_req::do_print () const
 {
-#ifndef NPRINT
-  Dynamic_req::do_print();
-  DOUT << " loudness " <<loudness_str (loudness_);
-#endif
+  DEBUG_OUT << articulation_str_;
 }
 
-String
-Dynamic_req::loudness_str (Loudness l) 
-{
-  switch (l) 
-    {
-  case FFF: return "fff";
-  case FF: return "ff";
-  case F: return "f";
-  case MF: return "mf";
-  case MP: return "mp";
-  case P: return "p";
-  case PP: return "pp";
-  case PPP: return "ppp";
-    }
-  assert (false);
-  return "";
-}
-
-Absolute_dynamic_req::Absolute_dynamic_req()
-{
-  loudness_ = MF;
-}
-
-
-Span_dynamic_req::Span_dynamic_req()
+bool
+Articulation_req::do_equal_b (Request const* r) const
 {
-  dynamic_dir_  = CENTER;
+  Articulation_req const* a = dynamic_cast<Articulation_req const*> (r);
+  
+  return a &&  articulation_str_ == a->articulation_str_;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Span_dynamic_req,Musical_req);
-
-void
-Span_dynamic_req::do_print() const
+Script_req::Script_req ()
 {
-#ifndef NPRINT
-  Span_req::do_print();
-  DOUT << "softer/louder: " <<dynamic_dir_;
-#endif
+  set_direction (CENTER);
 }
-
-
-IMPLEMENT_IS_TYPE_B1(Tie_req,Musical_req);
-
-