Imported Upstream version 2.16.0

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

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index d469c3f4636a9069065caf0c688afe0b93700319..165f04a8adbccecd2b72821b93f271ce6d6f9260 100644 (file)
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,26 +31,26 @@ class Spacing_spanner
 private:
   static void set_distances_for_loose_col (Grob *me, Grob *c, Drul_array<Item *> next_door, Spacing_options const *);
   static void generate_pair_spacing (Grob *me,
-                                    Paper_column *l, Paper_column *r,
-                                    Paper_column *nextr,
-                                    Spacing_options const *options);
+                                     Paper_column *l, Paper_column *r,
+                                     Paper_column *nextr,
+                                     Spacing_options const *options);
   static Real default_bar_spacing (Grob *, Grob *, Grob *, Moment);
-  static Rational effective_shortest_duration (Grob *me, vector<Grob*> const &all);
+  static Rational effective_shortest_duration (Grob *me, vector<Grob *> const &all);
   static void breakable_column_spacing (Grob *, Item *l, Item *r, Spacing_options const *);
-  static void prune_loose_columns (Grob *, vector<Grob*> *cols, Spacing_options  *);
-  static void set_explicit_neighbor_columns (vector<Grob*> const &cols);
-  static void set_implicit_neighbor_columns (vector<Grob*> const &cols);
-  static void generate_springs (Grob *me, vector<Grob*> const &cols, Spacing_options const *);
+  static void prune_loose_columns (Grob *, vector<Grob *> *cols, Spacing_options *);
+  static void set_explicit_neighbor_columns (vector<Grob *> const &cols);
+  static void set_implicit_neighbor_columns (vector<Grob *> const &cols);
+  static void generate_springs (Grob *me, vector<Grob *> const &cols, Spacing_options const *);
   static void musical_column_spacing (Grob *, Item *, Item *, Spacing_options const *);
   static bool fills_measure (Grob *, Item *, Item *);
 public:
-  static vector<Grob*> get_columns (Grob *me);
+  static vector<Grob *> get_columns (Grob *me);
   static Real note_spacing (Grob *, Grob *, Grob *, Spacing_options const *);
   static Spring standard_breakable_column_spacing (Grob *me, Item *l, Item *r, Spacing_options const *);
-  
+
   DECLARE_SCHEME_CALLBACK (set_springs, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_common_shortest_duration, (SCM));
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
 };
 
 #endif /* SPACING_SPANNER_HH */