X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fduration.cc;h=4768f015b501c6510f52b373fb4625d94f168889;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=80ba74e84c83de41a8c6508d60d4256b4830b164;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/duration.cc b/lily/duration.cc
index 80ba74e84c..4768f015b5 100644
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -1,11 +1,21 @@
 /*
-  duration.cc -- implement Duration
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-                 Han-Wen Nienhuys <hanwen@cs.uu.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 "duration.hh"
@@ -13,7 +23,6 @@
 #include "misc.hh"
 #include "lily-proto.hh"
 
-#include "ly-smobs.icc"
 
 int
 Duration::compare (Duration const &left, Duration const &right)
@@ -35,6 +44,56 @@ Duration::Duration (int log, int d)
   factor_ = Rational (1, 1);
 }
 
+Duration::Duration (Rational r, bool scale)
+{
+  factor_ = Rational (1, 1);
+
+  if (r.num () == 0.0)
+    {
+      durlog_ = 0;
+      dots_ = 0;
+    }
+  else
+    {
+      /* we want to find the integer k for which 2q/p > 2^k >= q/p.
+         It's simple to check that k' = \floor \log q - \floor \log p
+         satisfies the left inequality and is within a factor of 2 of
+         satistying the right one. Therefore either k = k' or k = k'+1 */
+
+      int p = (int) r.num ();
+      int q = (int) r.den ();
+      int k = intlog2 (q) - intlog2 (p);
+      if (shift_left (p, k) < q)
+        k++;
+
+      assert (shift_left (p, k) >= q && shift_left (p, (k - 1)) < q);
+
+      /* If we were to write out log (p/q) in base 2, then the position of the
+         first non-zero bit (ie. k in our notation) would be the durlog
+         and the number of consecutive 1s after that bit would be the number of
+         dots */
+      p = shift_left (p, k) - q;
+      dots_ = 0;
+      while ((p *= 2) >= q)
+        {
+          p -= q;
+          dots_++;
+        }
+
+      /* we only go up to 64th notes */
+      if (k > 6)
+        {
+          durlog_ = 6;
+          dots_ = 0;
+        }
+      else
+        durlog_ = k;
+
+      if (scale || k > 6)
+        factor_ = r / get_length ();
+    }
+}
+
 Duration
 Duration::compressed (Rational m) const
 {
@@ -48,7 +107,7 @@ Duration::get_length () const
 {
   Rational mom (1 << abs (durlog_));
 
-  if (durlog_> 0)
+  if (durlog_ > 0)
     mom = Rational (1) / mom;
 
   Rational delta = mom;
@@ -61,13 +120,13 @@ Duration::get_length () const
   return mom * factor_;
 }
 
-String
+string
 Duration::to_string () const
 {
-  String s;
+  string s;
 
-  if (durlog_ < 0  )
-    s = "log = "  + ::to_string (durlog_);
+  if (durlog_ < 0)
+    s = "log = " + ::to_string (durlog_);
   else
     s = ::to_string (1 << durlog_);
 
@@ -77,42 +136,32 @@ Duration::to_string () const
   return s;
 }
 
+const char Duration::type_p_name_[] = "ly:duration?";
 
-IMPLEMENT_TYPE_P (Duration, "ly:duration?");
-
-SCM
-Duration::mark_smob (SCM)
-{
-  return SCM_EOL;
-}
 
-IMPLEMENT_SIMPLE_SMOBS (Duration);
 int
-Duration::print_smob (SCM s, SCM port, scm_print_state *)
+Duration::print_smob (SCM port, scm_print_state *)
 {
-  Duration  *r = (Duration *) SCM_CELL_WORD_1 (s);
-
   scm_puts ("#<Duration ", port);
-  scm_display (scm_makfrom0str (r->to_string ().to_str0 ()), port);
+  scm_display (ly_string2scm (to_string ()), port);
   scm_puts (" >", port);
 
   return 1;
 }
 
 SCM
-Duration::equal_p (SCM a , SCM b)
+Duration::equal_p (SCM a, SCM b)
 {
-  Duration  *p = (Duration *) SCM_CELL_WORD_1 (a);
-  Duration  *q = (Duration *) SCM_CELL_WORD_1 (b);
+  Duration *p = (Duration *) SCM_CELL_WORD_1 (a);
+  Duration *q = (Duration *) SCM_CELL_WORD_1 (b);
 
   bool eq = p->dots_ == q->dots_
-    && p->durlog_ == q->durlog_
-    && p->factor_ == q->factor_;
+            && p->durlog_ == q->durlog_
+            && p->factor_ == q->factor_;
 
   return eq ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
-
 int
 Duration::duration_log () const
 {