Run `make grand-replace'.

[lilypond.git] / lily / pitch-interval.cc

diff --git a/lily/pitch-interval.cc b/lily/pitch-interval.cc
index 00498e724c3a914f6b3c482af7539d37cf914d03..8c70cf4a09f1dee81582e7608b05ff374d4ace73 100644 (file)
--- a/lily/pitch-interval.cc
+++ b/lily/pitch-interval.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pitch-interval.hh"
@@ -12,27 +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;
 }