X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmulti-measure-rest.hh;h=7c07b3c8dc670953f2d4f78da59a31ff1a158de6;hb=711a7ef3c76be3d40902a0181fdb5d4558e56c5b;hp=50ab957bb359c47bcca821949b48cc7c246fdc01;hpb=c21d49df60cb97801ab33ab8a1bad6f2c81cd820;p=lilypond.git

diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index 50ab957bb3..7c07b3c8dc 100644
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -1,35 +1,45 @@
-/*   
-  multi-measure-rest.hh -- declare Multi_measure_rest
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#ifndef MULTI_MEASURE_REST_HH
-#define MULTI_MEASURE_REST_HH
+  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-#include "spanner.hh"
+  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.
 
-class Multi_measure_rest : public Spanner
-{
-public:
-  Multi_measure_rest (SCM);
- static SCM brew_molecule (SCM);
-  
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-  void add_column (Item*);
-  Molecule compound_rest (int)const;
+#ifndef MULTI_MEASURE_REST_HH
+#define MULTI_MEASURE_REST_HH
 
-  SCM member_brew_molecule () const;
-  VIRTUAL_COPY_CONS (Score_element);
+#include "grob-interface.hh"
+#include "rod.hh"
 
-  virtual void do_add_processing ();
-  SCM member_after_line_breaking ();
-  static SCM after_line_breaking (SCM);
-  virtual Array<Rod> get_rods () const;
+class Multi_measure_rest
+{
+public:
+  DECLARE_GROB_INTERFACE();
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (percent, (SCM));
+  static void add_column (Grob *, Item *);
+  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
+  DECLARE_SCHEME_CALLBACK (set_text_rods, (SCM));
+  DECLARE_SCHEME_CALLBACK (centered_stencil, (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 */