Run grand-replace (issue 3765)

[lilypond.git] / lily / include / spacing-options.hh

diff --git a/lily/include/spacing-options.hh b/lily/include/spacing-options.hh
index 1b5ee32db09e49170f533713927f47bb1ffd3aee..a270d585e1e92f14e051e958798354e30d23d5fc 100644 (file)
--- a/lily/include/spacing-options.hh
+++ b/lily/include/spacing-options.hh
@@ -1,10 +1,20 @@
-/* 
-  spacing-options.hh -- declare Spacing_options
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2006--2014 Han-Wen Nienhuys <hanwen@lilypond.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 SPACING_OPTIONS_HH
@@ -14,6 +24,11 @@
 #include "rational.hh"
 #include "std-vector.hh"
 
+/*
+  Various options for spacing. Usually inited from SpacingSpanner, but sometimes
+  from GraceSpacing.
+ */
+
 struct Spacing_options
 {
   bool packed_;
@@ -23,10 +38,9 @@ struct Spacing_options
   Rational global_shortest_;
   Real increment_;
   Real shortest_duration_space_;
-  vector<Grob*> columns_;
-  
-  Spacing_options();
+
+  Spacing_options ();
   void init_from_grob (Grob *me);
-  Real get_duration_space (Rational d, bool *) const;
+  Real get_duration_space (Rational d) const;
 };
 #endif /* SPACING_OPTIONS_HH */