Run fixcc.py with astyle 2.02

diff --git a/lily/beam.cc b/lily/beam.cc
index 4e48d437392efccd7232804f37fea0cd120cfd02..0cfc3e193cba6b3feea911abb09a6f9e5118d6c2 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1280,7 +1280,6 @@ Beam::rest_collision_callback (SCM smob, SCM prev_offset)
                             + (beam_count - 1) * beam_translation;
   Real beam_y = stem_y - d * height_of_my_beams;
 
-
   Interval rest_extent = rest->extent (rest, Y_AXIS);
   rest_extent.translate (offset + rest->get_parent (Y_AXIS)->relative_coordinate (common_y, Y_AXIS));
 

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index 22a4d183099bf069d70fe9cc423c851d180bd2cc..cd28a29c3f0af531de7cb954f65e538fb1c80b02 100644 (file)
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -153,10 +153,12 @@ void protect_smob (SCM smob, SCM *prot_cons);
 void unprotect_smob (SCM smob, SCM *prot_cons);
 
 extern bool parsed_objects_should_be_dead;
-class parsed_dead {
+class parsed_dead
+{
   static vector<parsed_dead *> elements;
   SCM data;
-  SCM readout_one () {
+  SCM readout_one ()
+  {
     SCM res = data;
     data = SCM_UNDEFINED;
     return res;
@@ -171,11 +173,11 @@ public:
 };
 
 #ifndef NDEBUG
-#define ASSERT_LIVE_IS_ALLOWED(arg)                                    \
-  do {                                                                 \
-    static parsed_dead pass_here;                                      \
-    if (parsed_objects_should_be_dead)                                 \
-      pass_here.checkin (arg);                                         \
+#define ASSERT_LIVE_IS_ALLOWED(arg)                                     \
+  do {                                                                  \
+    static parsed_dead pass_here;                                       \
+    if (parsed_objects_should_be_dead)                                  \
+      pass_here.checkin (arg);                                          \
   } while (0)
 #else
 #define ASSERT_LIVE_IS_ALLOWED(arg) do { } \

diff --git a/lily/music-function-scheme.cc b/lily/music-function-scheme.cc
index 39f1bdecbc3e13196a32b924465fdeb5a48c1848..e9e9a68ec6f696859e3c66e3e3fe2dd778cc50e2 100644 (file)
--- a/lily/music-function-scheme.cc
+++ b/lily/music-function-scheme.cc
@@ -17,8 +17,8 @@ LY_DEFINE (ly_music_function_extract, "ly:music-function-extract", 1, 0, 0,
 }
 
 LY_DEFINE (ly_music_function_signature, "ly:music-function-signature", 1, 0, 0,
-          (SCM x),
-          "Return the function signature inside@tie{}@var{x}.")
+           (SCM x),
+           "Return the function signature inside@tie{}@var{x}.")
 {
   LY_ASSERT_TYPE (is_music_function, x, 1);
 

diff --git a/lily/music-function.cc b/lily/music-function.cc
index b9159fe3a74b7e08f5a72e243adbee87f6b93c5e..f206b6b3823b7f065ab1e2c8730cc31df76d8698 100644 (file)
--- a/lily/music-function.cc
+++ b/lily/music-function.cc
@@ -22,13 +22,14 @@
 #include "music.hh"
 #include "ly-smobs.icc"
 
-class Musicfunction {
+class Musicfunction
+{
   DECLARE_SIMPLE_SMOBS (Musicfunction);
   SCM signature_;
   SCM function_;
 public:
   Musicfunction (SCM signature, SCM function):
-    signature_(signature), function_(function) { }
+    signature_ (signature), function_ (function) { }
   SCM get_function () { return function_; }
   SCM get_signature () { return signature_; }
 };

diff --git a/lily/undead.cc b/lily/undead.cc
index a3387ea9e9ff756e7068b271e93ab77faf0352b1..b29386d2ce839a890c51e8842424a14e0a7bf38f 100644 (file)
--- a/lily/undead.cc
+++ b/lily/undead.cc
@@ -20,12 +20,13 @@
 #include "smobs.hh"
 #include "ly-smobs.icc"
 
-class Undead {
+class Undead
+{
   DECLARE_SIMPLE_SMOBS (Undead);
   SCM object_;
 public:
   SCM object () { return object_; }
-  Undead (SCM object = SCM_UNDEFINED) : object_(object) { };
+  Undead (SCM object = SCM_UNDEFINED) : object_ (object) { };
 };
 
 SCM
@@ -40,8 +41,8 @@ Undead::mark_smob (SCM s)
 
 int
 Undead::print_smob (SCM undead,
-                   SCM port,
-                   scm_print_state *)
+                    SCM port,
+                    scm_print_state *)
 {
   scm_puts ("#<Undead ", port);
   scm_display (Undead::unsmob (undead)->object (), port);
@@ -54,17 +55,17 @@ IMPLEMENT_DEFAULT_EQUAL_P (Undead);
 IMPLEMENT_TYPE_P (Undead, "ly:undead?")
 
 LY_DEFINE (ly_make_undead, "ly:make-undead",
-          1, 0, 0, (SCM object),
-          "This packages @var{object} in a manner that keeps it from"
-          " triggering \"Parsed object should be dead\" messages.")
+           1, 0, 0, (SCM object),
+           "This packages @var{object} in a manner that keeps it from"
+           " triggering \"Parsed object should be dead\" messages.")
 {
   Undead undead (object);
   return undead.smobbed_copy ();
 }
 
 LY_DEFINE (ly_get_undead, "ly:get-undead",
-          1, 0, 0, (SCM undead),
-          "Get back object from @var{undead}.")
+           1, 0, 0, (SCM undead),
+           "Get back object from @var{undead}.")
 {
   LY_ASSERT_SMOB (Undead, undead, 1);
   return Undead::unsmob (undead)->object ();
@@ -85,18 +86,19 @@ SCM
 parsed_dead::readout ()
 {
   SCM result = SCM_EOL;
-  for (vsize i = 0; i < elements.size (); i++) {
-    SCM elt = elements[i]->readout_one ();
-    if (!SCM_UNBNDP (elt))
-      result = scm_cons (elt, result);
-  }
+  for (vsize i = 0; i < elements.size (); i++)
+    {
+      SCM elt = elements[i]->readout_one ();
+      if (!SCM_UNBNDP (elt))
+        result = scm_cons (elt, result);
+    }
   return result;
 }
 
 LY_DEFINE (ly_parsed_undead_list_x, "ly:parsed-undead-list!",
-          0, 0, 0, (),
-          "Return the list of objects that have been found live"
-          " that should have been dead, and clear that list.")
+           0, 0, 0, (),
+           "Return the list of objects that have been found live"
+           " that should have been dead, and clear that list.")
 {
   return parsed_dead::readout ();
 }