From c2489f8f9f47b1740b361366c0b317a799c3a090 Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Mon, 27 Aug 2012 10:34:00 +0100
Subject: [PATCH] Run fixcc + astyle2.02.1

---
 flower/include/yaffut.hh             | 4 ++--
 lily/include/beam-scoring-problem.hh | 2 +-
 lily/include/skyline.hh              | 4 ++--
 lily/include/slur.hh                 | 2 +-
 lily/page-breaking.cc                | 2 +-
 lily/staff-performer.cc              | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flower/include/yaffut.hh b/flower/include/yaffut.hh
index aa54fa6616..8b10d23aa5 100644
--- a/flower/include/yaffut.hh
+++ b/flower/include/yaffut.hh
@@ -277,7 +277,7 @@ struct Test: public ITest, public virtual Suite
   static Registrator<Suite, Case> s_Registrator;
   Test (): Suite ()
   {
-    Registrator<Suite, Case>* r = &s_Registrator;
+    Registrator<Suite, Case> *r = &s_Registrator;
     (void)r;
   }
   template <typename E, typename T>
@@ -301,7 +301,7 @@ struct Test<Case, void>: public ITest
   static Registrator<Case, void> s_Registrator;
   Test ()
   {
-    Registrator<Case, void>* r = &s_Registrator;
+    Registrator<Case, void> *r = &s_Registrator;
     (void)r;
   }
   template <typename E, typename T>
diff --git a/lily/include/beam-scoring-problem.hh b/lily/include/beam-scoring-problem.hh
index 6e2302d19a..7e77d6794d 100644
--- a/lily/include/beam-scoring-problem.hh
+++ b/lily/include/beam-scoring-problem.hh
@@ -190,7 +190,7 @@ private:
   void score_slope_direction (Beam_configuration *config) const;
   void score_slope_musical (Beam_configuration *config) const;
   void score_stem_lengths (Beam_configuration *config) const;
-  void generate_quants (vector<Beam_configuration *>* scores) const;
+  void generate_quants (vector<Beam_configuration *> *scores) const;
   void score_collisions (Beam_configuration *config) const;
 };
 
diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index 0715c545a6..ceedf24007 100644
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -54,9 +54,9 @@ private:
   list<Building> buildings_;
   Direction sky_;
 
-  void internal_merge_skyline (list<Building>*, list<Building>*,
+  void internal_merge_skyline (list<Building> *, list<Building> *,
                                list<Building> *const result);
-  list<Building> internal_build_skyline (list<Box>*, Real, Axis, Direction);
+  list<Building> internal_build_skyline (list<Box> *, Real, Axis, Direction);
 
   DECLARE_SIMPLE_SMOBS (Skyline);
 
diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index d1f743ca8e..b20311785d 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -30,7 +30,7 @@ public:
   static void add_column (Grob *me, Grob *col);
   static void add_extra_encompass (Grob *me, Grob *col);
   static void replace_breakable_encompass_objects (Grob *me);
-  static void auxiliary_acknowledge_extra_object (Grob_info const &, vector<Grob *>&, vector<Grob *>&);
+  static void auxiliary_acknowledge_extra_object (Grob_info const &, vector<Grob *> &, vector<Grob *> &);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index 18582a607d..9a6f8f40f2 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -504,7 +504,7 @@ Page_breaking::page_height (int page_num, bool last) const
   // This means that we won't cache properly if page_num is negative or
   // if calc_height returns a negative number.  But that's likely to
   // be rare, so it shouldn't affect performance.
-  vector<Real>& cache = last ? last_page_height_cache_ : page_height_cache_;
+  vector<Real> &cache = last ? last_page_height_cache_ : page_height_cache_;
   if (page_num >= 0 && (int) cache.size () > page_num && cache[page_num] >= 0)
     return cache[page_num];
   else
diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 77dc986cfe..31f3af6176 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -245,7 +245,7 @@ int
 Staff_performer::get_channel (string instrument)
 {
   SCM channel_mapping = get_property ("midiChannelMapping");
-  map<string, int>& channel_map
+  map<string, int> &channel_map
     = (channel_mapping != ly_symbol2scm ("instrument"))
       ? channel_map_
       : static_channel_map_;
-- 
2.39.2