Merge branch 'issue4032'

[lilypond.git] / lily / include / duration.hh

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index b3e7841f08bedb50158e2b98ac31a049592e952b..959ed09e1be5edb137bb776357ddb93f4bfe22da 100644 (file)
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -1,9 +1,20 @@
 /*
-  duration.hh -- declare Duration
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
+  Copyright (C) 1997--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  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/>.
 */
 
 #ifndef DURATION_HH
@@ -20,6 +31,7 @@ public:
 
   Duration ();
   Duration (int, int);
+  Duration (Rational, bool scale);
   string to_string () const;
 
   Duration compressed (Rational) const;
@@ -42,7 +54,8 @@ private:
 };
 
 INSTANTIATE_COMPARE (Duration, Duration::compare);
-DECLARE_UNSMOB (Duration, duration);
+
+extern SCM Duration_type_p_proc;
 
 #endif // DURATION_HH