release: 1.3.146

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

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index d91e6d35ec12abad9c815af85c9c127d288e2c6e..463d0775e81c558d266b09e98e77b3d58c6465a1 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "musical-request.hh"
@@ -14,45 +14,30 @@
 
 Tremolo_req::Tremolo_req ()
 {
-  type_i_ = 0;
 }
 
 
 void
-Melodic_req::transpose (Musical_pitch delta)
+Melodic_req::transpose (Pitch delta)
 {
-  pitch_.transpose (delta);
+  Pitch p = *unsmob_pitch (get_mus_property ("pitch"));
   
-  if (abs (pitch_.accidental_i_) > 2)
+  p.transpose (delta);
+  
+  if (abs (p.alteration_i_) > 2)
     {
        warning (_f ("Transposition by %s makes accidental larger than two",
          delta.str ()));
     }
-}
-
 
+  set_mus_property ("pitch", p.smobbed_copy ());
+}
 
 bool
 Melodic_req::do_equal_b (Request const* r) const
 {
   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)
-{
-  return Musical_pitch::compare (m1.pitch_, m2.pitch_);
-}
-
-
-
-
-
-int
-Rhythmic_req::compare (Rhythmic_req const &r1, Rhythmic_req const &r2)
-{
-  return (r1.length_mom () - r2.length_mom ());
+  return m; // && !compare (*m, *this);
 }
 
 bool
@@ -60,7 +45,7 @@ Rhythmic_req::do_equal_b (Request const* r) const
 {
   Rhythmic_req const* rh = dynamic_cast <Rhythmic_req const*> (r);
 
-  return rh && !compare (*this, *rh);
+  return rh; // ;  && !compare (*this, *rh);
 }
 
 
@@ -68,16 +53,17 @@ Rhythmic_req::do_equal_b (Request const* r) const
 Moment
 Rhythmic_req::length_mom () const
 {
-  return duration_.length_mom ();
+  return  unsmob_duration (get_mus_property ("duration"))->length_mom ();
+
 }
 
 void
 Rhythmic_req::compress (Moment m)
 {
-  duration_.compress (m);
-}
-
+  Duration *d =  unsmob_duration (get_mus_property ("duration"));
 
+  set_mus_property ("duration", d ->compressed (m).smobbed_copy ());
+}
 
 bool
 Note_req::do_equal_b (Request const* r) const
@@ -89,8 +75,6 @@ Note_req::do_equal_b (Request const* r) const
 
 Note_req::Note_req ()
 {
-  cautionary_b_ = false;
-  forceacc_b_ = false;
 }
 
 
@@ -101,12 +85,11 @@ bool
 Span_req::do_equal_b (Request const*r) const
 {
   Span_req const* s = dynamic_cast <Span_req const*> (r);
-  return s && span_dir_ == s->span_dir_;
+  return s && get_span_dir () == s->get_span_dir ();
 }
 
 Span_req::Span_req ()
 {
-  span_dir_ = CENTER;
 }
 
 
@@ -114,20 +97,28 @@ bool
 Text_script_req::do_equal_b (Request const* r) const
 {
   Text_script_req const* t  = dynamic_cast<Text_script_req const*> (r);
-  return t && gh_equal_p (text_, t->text_);
+  return t && gh_equal_p (get_mus_property ("text"),
+                         t->get_mus_property ("text"));
 }
 
-
 bool
 Articulation_req::do_equal_b (Request const* r) const
 {
   Articulation_req const* a = dynamic_cast<Articulation_req const*> (r);
   
-  return a &&  articulation_str_ == a->articulation_str_;
+  return a; //  &&  articulation_str_ == a->articulation_str_;
 }
 
 
-Script_req::Script_req ()
-{
-  set_direction (CENTER);
-}
+
+
+
+
+
+
+
+
+
+
+
+