X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmulti-measure-rest.hh;h=f4d379ade4a639c3a6ac39c6bebee33507434874;hb=b0dce4ca74c6ebf43a3f574ccf281b8bc58a3b75;hp=887e0b504e9901485e73e5e6d354080cb63cdbe0;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index 887e0b504e..f4d379ade4 100644
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -1,28 +1,43 @@
-/*   
-  multi-measure-rest.hh -- declare Multi_measure_rest
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2015 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 MULTI_MEASURE_REST_HH
 #define MULTI_MEASURE_REST_HH
 
-#include "lily-proto.hh"
-#include "lily-guile.hh"
+#include "grob-interface.hh"
 #include "rod.hh"
 
 class Multi_measure_rest
 {
 public:
-  static void set_interface (Grob*);
-  static bool has_interface (Grob*);
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
   DECLARE_SCHEME_CALLBACK (percent, (SCM));
-  static  void add_column (Grob*,Item*);
-  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM ));
+  static void add_column (Grob *, Item *);
+  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
+  DECLARE_SCHEME_CALLBACK (set_text_rods, (SCM));
+
+  static void calculate_spacing_rods (Grob *me, Real length);
+  static Stencil big_rest (Grob *, Real);
+  static Stencil symbol_stencil (Grob *, Real);
+  static Stencil church_rest (Grob *, Font_metric *, int, Real);
+  static Interval bar_width (Spanner *me);
 };
 
 #endif /* MULTI_MEASURE_REST_HH */