Merge with master

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

diff --git a/lily/pitch-interval.cc b/lily/pitch-interval.cc
index 069c86b7848871d2da25546d95706c013540dff1..064c6343275974e0fafbd790e1fc30f9a36d8b0a 100644 (file)
--- a/lily/pitch-interval.cc
+++ b/lily/pitch-interval.cc
@@ -1,10 +1,9 @@
-/* 
-  pitch-interval.cc --  implement Pitch_interval
-  
+/*
+  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,27 @@
 
 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
 Pitch_interval::add_point (Pitch p)
 {
-  if (elem_ref(LEFT) >  p)
-    elem_ref(LEFT) = p;
-  if (elem_ref(RIGHT) < p)
-    elem_ref(RIGHT) = p;
+  if (at (LEFT) > p)
+    at (LEFT) = p;
+  if (at (RIGHT) < p)
+    at (RIGHT) = p;
 }