Run grand-replace (issue 3765)

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

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index 931fdab7c9aae1fd0efb3be63c7821692e80bf4e..e05ed7042ad63c5c6920e40277c58d7e2d26b295 100644 (file)
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -1,10 +1,20 @@
 /*
-  duration.hh -- declare Duration
-  
-  source file of the LilyPond music typesetter
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2014 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
@@ -14,24 +24,26 @@
 
 /**
    A musical duration.
-  */
-struct Duration {
+*/
+struct Duration
+{
 public:
-  
+
   Duration ();
   Duration (int, int);
-  String to_string () const;
+  Duration (Rational, bool scale);
+  string to_string () const;
 
   Duration compressed (Rational) const;
-  Rational get_length () const ;
+  Rational get_length () const;
   Rational factor () const { return factor_; }
   int duration_log () const;
   int dot_count () const;
 
-  static int compare (Duration const&, Duration const&);
+  static int compare (Duration const &, Duration const &);
 
   DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
-  DECLARE_SIMPLE_SMOBS (Duration, );
+  DECLARE_SIMPLE_SMOBS (Duration);
 
 private:
   /// Logarithm of the base duration.
@@ -44,5 +56,7 @@ private:
 INSTANTIATE_COMPARE (Duration, Duration::compare);
 DECLARE_UNSMOB (Duration, duration);
 
+extern SCM Duration_type_p_proc;
+
 #endif // DURATION_HH