X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch-interval.cc;h=3a5670be501379d340f5b54102137a40afa1aca0;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=ed8e0530de70c6bc1b8797bed62d393e4321ca21;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/pitch-interval.cc b/lily/pitch-interval.cc
index ed8e0530de..3a5670be50 100644
--- a/lily/pitch-interval.cc
+++ b/lily/pitch-interval.cc
@@ -1,10 +1,20 @@
-/* 
-  pitch-interval.cc --  implement Pitch_interval
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pitch-interval.hh"
@@ -13,30 +23,70 @@
 
 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);
+  at (RIGHT) = Pitch (-100, 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);
+  at (RIGHT) = Pitch (-100, 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;
 }