X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch-interval.cc;h=a7390aa282cb0825f2bc744520db6c7627e5b6c5;hb=1eeec67c6d68aa6f64115d69ae1786f438aa8676;hp=3787d322e5343cf5827db448be1b0a911255bf41;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git

diff --git a/lily/pitch-interval.cc b/lily/pitch-interval.cc
index 3787d322e5..a7390aa282 100644
--- a/lily/pitch-interval.cc
+++ b/lily/pitch-interval.cc
@@ -1,10 +1,9 @@
-/* 
+/*
   pitch-interval.cc -- implement Pitch_interval
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pitch-interval.hh"
@@ -13,30 +12,71 @@
 
 Pitch_interval::Pitch_interval (Pitch p1, Pitch p2)
 {
-  elem_ref(LEFT) =  p1;
-  elem_ref(RIGHT) =  p2;
+  at (LEFT) = p1;
+  at (RIGHT) = p2;
 }
 
-
 Pitch_interval::Pitch_interval ()
 {
-  elem_ref(LEFT) =  Pitch (100, 0, 0);
-  elem_ref(RIGHT) =  Pitch (-100, 0, 0);
+  at (LEFT) = Pitch (100, 0, 0);
+  at (RIGHT) = Pitch (-100, 0, 0);
 }
 
-
 bool
 Pitch_interval::is_empty () const
 {
-  return elem(LEFT) > elem(RIGHT);
+  return at (LEFT) > at (RIGHT);
 }
 
-
-void
+Drul_array<bool>
 Pitch_interval::add_point (Pitch p)
 {
-  if (elem_ref(LEFT) >  p)
-    elem_ref(LEFT) = p;
-  if (elem_ref(RIGHT) < p)
-    elem_ref(RIGHT) = p;
+  Drul_array<bool> expansions(false,false);
+  if (at (LEFT).tone_pitch () > p.tone_pitch ())
+    {
+      at (LEFT) = p;
+      expansions [LEFT] = true;
+    }
+  if (at (RIGHT).tone_pitch () < p.tone_pitch ())
+    {
+      at (RIGHT) = p;
+      expansions [RIGHT] = true;
+    }
+  return expansions;
+}
+
+
+Pitch_lexicographic_interval::Pitch_lexicographic_interval (Pitch p1, Pitch p2)
+{
+  at (LEFT) = p1;
+  at (RIGHT) = p2;
+}
+
+Pitch_lexicographic_interval::Pitch_lexicographic_interval ()
+{
+  at (LEFT) = Pitch (100, 0, 0);
+  at (RIGHT) = Pitch (-100, 0, 0);
+}
+
+bool
+Pitch_lexicographic_interval::is_empty () const
+{
+  return at (LEFT) > at (RIGHT);
+}
+
+Drul_array<bool>
+Pitch_lexicographic_interval::add_point (Pitch p)
+{
+  Drul_array<bool> expansions(false,false);
+  if (at (LEFT) > p)
+    {
+      at (LEFT) = p;
+      expansions [LEFT] = true;
+    }
+  if (at (RIGHT) < p)
+    {
+      at (RIGHT) = p;
+      expansions [RIGHT] = true;
+    }
+  return expansions;
 }