X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Foffset.cc;h=2fc9bf9aa61e9412b0fbf266be489b0dba4ac24f;hb=cb0b407e567feca71cbc5f9479a06b266c69a26c;hp=41b42d8b9715dfe24697794fe23d8d1683b0d6a0;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/flower/offset.cc b/flower/offset.cc
index 41b42d8b97..2fc9bf9aa6 100644
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -19,13 +19,15 @@
 
 #include "offset.hh"
 
+using std::string;
+
 #ifndef STANDALONE
 string
 Offset::to_string () const
 {
   string s;
   s = string (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", "
-    + ::to_string (coordinate_a_[Y_AXIS]) + ")";
+      + ::to_string (coordinate_a_[Y_AXIS]) + ")";
   return s;
 }
 #endif
@@ -90,24 +92,34 @@ Offset::angle_degrees () const
 Real
 Offset::length () const
 {
-  return sqrt (sqr (coordinate_a_[X_AXIS])
-		    + sqr (coordinate_a_[Y_AXIS]));
+  return hypot (coordinate_a_[X_AXIS], coordinate_a_[Y_AXIS]);
 }
 
 bool
 Offset::is_sane () const
 {
   return !isnan (coordinate_a_[X_AXIS])
-    && !isnan (coordinate_a_ [Y_AXIS])
-    && !isinf (coordinate_a_[X_AXIS]) 
-    && !isinf (coordinate_a_[Y_AXIS]);
+         && !isnan (coordinate_a_ [Y_AXIS])
+         && !isinf (coordinate_a_[X_AXIS])
+         && !isinf (coordinate_a_[Y_AXIS]);
 }
 
 Offset
 Offset::direction () const
 {
   Offset d = *this;
-  d /= length (); 
+  if (isinf (d[X_AXIS]))
+    {
+      if (!isinf (d[Y_AXIS]))
+        return Offset ((d[X_AXIS] > 0.0 ? 1.0 : -1.0), 0.0);
+    }
+  else if (isinf (d[Y_AXIS]))
+    return Offset (0.0, (d[Y_AXIS] > 0.0 ? 1.0 : -1.0));
+  else if (d[X_AXIS] == 0.0 && d[Y_AXIS] == 0.0)
+    return d;
+  // The other cases propagate or produce NaN as appropriate.
+
+  d /= length ();
   return d;
 }