release: 1.1.41

[lilypond.git] / lily / musical-request.cc

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 574e08dcad70d27d8fbf72f9488bf71e89c99b22..369066fa7f19a1f03462551a40510e5ca772506a 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -3,36 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 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"
-
-
-
-
-void
-Musical_req::do_print () const{}
-void
-Tie_req::do_print () const{}
-
-
 
-
-
-
-
-void
-Musical_span_req::do_print () const
-{
-  Span_req::do_print ();
-}
-            
+#include "music-list.hh"
 
 void
 Span_req::do_print () const
@@ -42,25 +20,6 @@ Span_req::do_print () const
 #endif
 }
 
-
-
-Spacing_req::Spacing_req ()
-{
-  next = 0;
-  distance = 0;
-  strength = 0;
-}
-
-void
-Spacing_req::do_print () const
-{
-#ifndef NPRINT
-  DOUT << "next " << next << "dist " << distance << "strength\n";
-#endif
-}
-
-
-
 Abbreviation_req::Abbreviation_req ()
 {
   type_i_ = 0;
@@ -77,16 +36,6 @@ Abbreviation_req::do_print () const
 
 
 
-void
-Blank_req::do_print () const
-{
-  Spacing_req::do_print ();
-}
-
-Melodic_req::Melodic_req ()
-{
-}
-
 void
 Melodic_req::transpose (Musical_pitch delta)
 {
@@ -117,21 +66,11 @@ Melodic_req::compare (Melodic_req const &m1 , Melodic_req const&m2)
 void
 Melodic_req::do_print () const
 {
-pitch_.print ();
+  pitch_.print ();
 }
 
 
-Tonic_req::Tonic_req ()
-{
-}
 
-void
-Tonic_req::do_print () const
-{
-#ifndef NPRINT
-  Melodic_req::do_print ();
-#endif
-}
 
 int
 Rhythmic_req::compare (Rhythmic_req const &r1, Rhythmic_req const &r2)
@@ -147,9 +86,6 @@ Rhythmic_req::do_equal_b (Request*r) const
   return rh && !compare (*this, *rh);
 }
 
-
-
-
 void
 Rhythmic_req::do_print () const
 {
@@ -211,54 +147,12 @@ Note_req::do_print () const
 #endif
 }
 
-void
-Rest_req::do_print () const
-{
-      Rhythmic_req::do_print ();
-}
-
-void
-Multi_measure_rest_req::do_print () const
-{
-      Rhythmic_req::do_print ();
-}
-
-
-void
-Beam_req::do_print () const
-{
-}
 
 Abbreviation_beam_req::Abbreviation_beam_req ()
 {
   type_i_ = 0;
 }
 
-void
-Abbreviation_beam_req::do_print () const
-{
-}
-
-
-void
-Slur_req::do_print () const
-{
-}
-
-
-
-
-
-Extender_req::Extender_req ()
-{
-}
-
-void
-Extender_req::do_print () const
-{
-}
-
-
 bool
 Span_req::do_equal_b (Request*r) const
 {
@@ -271,73 +165,12 @@ Span_req::Span_req ()
   spantype_ = CENTER;
 }
 
-Script_req::Script_req (Script_req const&s)
-{
-  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 = dynamic_cast <Script_req *> (r);
-  return s &&  scriptdef_p_->equal_b (*s->scriptdef_p_);
-}
-
-Script_req::Script_req ()
-{
-  dir_ = CENTER;
-  scriptdef_p_ = 0;
-}
-
-
-
-
-void
-Script_req::do_print () const
-{
-#ifndef NPRINT
-  DOUT << " dir " << dir_;
-  scriptdef_p_->print ();
-#endif
-}
-
-void
-Musical_script_req::do_print () const
-{
-  Script_req::do_print ();
-}
-
-Script_req::~Script_req ()
-{
-  delete scriptdef_p_;
-}
-
-void
-Skip_req::do_print () const
-{
-#ifndef NPRINT
-  DOUT << "duration: " << length_mom ();
-#endif
-}
-
-void
-Dynamic_req::do_print () const
-{
-  Musical_req::do_print ();
-}
 
 void
 Absolute_dynamic_req::do_print () const
 {
 #ifndef NPRINT
-  Dynamic_req::do_print ();
-  DOUT << " loudness " <<loudness_str ();
+  DOUT << " loudness " <<loudness_str_ ;
 #endif
 }
 
@@ -345,58 +178,12 @@ bool
 Absolute_dynamic_req::do_equal_b (Request *r) const
 {
   Absolute_dynamic_req *a = dynamic_cast <Absolute_dynamic_req *> (r);
-  return a&& loudness_ == a->loudness_;
-}
-
-String
-Dynamic_req::loudness_static_str (Loudness l)
-{
-  switch (l)
-    {
-    case FFFFFF: return "ffffff";
-    case FFFFF : return "fffff";
-    case FFFF: return "ffff";
-    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";
-    case PPPP: return "pppp";
-    case PPPPP: return "ppppp";
-    case PPPPPP: return "pppppp";    
-
-    case FP: return "fp";
-    case SF: return "sf";
-    case SFF: return "sff";
-    case SFZ: return "sfz";
-    case SP: return "sp";
-    case SPP: return "spp";
-    case RFZ: return "rfz";
-    }
-  return "";
+  return a&& loudness_str_ == a->loudness_str_;
 }
 
-String
-Absolute_dynamic_req::loudness_str () const
-{
-  String str = loudness_static_str (loudness_);
-  if (str.empty_b ())
-    {
-      String s = "mf";
-      warning (_f ("never heard of dynamic scale `\%s\', assuming %s",
-       str, s));
-      str = s;
-    }
-  return str;
-}
-
-
 Absolute_dynamic_req::Absolute_dynamic_req ()
 {
-  loudness_ = MF;
+  loudness_str_ = "fm";                // yes, "illegal" on purpose.
 }
 
 
@@ -423,5 +210,22 @@ Span_dynamic_req::do_print () const
 #endif
 }
 
+void
+Text_script_req::do_print () const
+{
+  DOUT << "text" << text_str_
+       << ", style = " << style_str_;
+}
 
+void
+Articulation_req::do_print () const
+{
+  DOUT << articulation_str_;
+}
 
+bool
+Articulation_req::do_equal_b (Request*r) const
+{
+  Articulation_req * a = dynamic_cast<Articulation_req*>(r);
+  return articulation_str_ == a->articulation_str_;
+}