Fix #229.

[lilypond.git] / lily / object-key-dumper.cc

diff --git a/lily/object-key-dumper.cc b/lily/object-key-dumper.cc
index 8ba5a8c36c8af7654f92940b23cffae5769792eb..c835c1ef632143f7480b694d3865f90f346550ff 100644 (file)
--- a/lily/object-key-dumper.cc
+++ b/lily/object-key-dumper.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "object-key-dumper.hh"
@@ -20,9 +20,7 @@ Object_key_dumper::mark_smob (SCM smob)
   for (Key_to_key_map::const_iterator i (dumper->serialized_keys_.begin ());
        i != dumper->serialized_keys_.end ();
        i++)
-    {
-      scm_gc_mark ((*i).first->self_scm ());
-    }
+    scm_gc_mark ((*i).first->self_scm ());
   return SCM_EOL;
 }
 
@@ -59,11 +57,9 @@ Object_key_dumper::serialize_key (Object_key const *key)
       if (Object_key const *sub_key = unsmob_key (scm_car (s)))
        scm_set_car_x (s, dump_key (sub_key));
       else if (Moment *mom = unsmob_moment (scm_car (s)))
-       {
-         scm_set_car_x (s,
-                        scm_list_2 (ly_symbol2scm ("unquote"),
-                                    mom->as_scheme ()));
-       }
+       scm_set_car_x (s,
+                      scm_list_2 (ly_symbol2scm ("unquote"),
+                                  mom->as_scheme ()));
     }
 
   file_contents_ = scm_cons (scm_list_3 (ly_symbol2scm ("define-key"),
@@ -83,13 +79,9 @@ SCM
 Object_key_dumper::dump_key (Object_key const *key)
 {
   if (key_serial_numbers_.find (key) != key_serial_numbers_.end ())
-    {
-      return key_serial (key_serial_numbers_[key]);
-    }
+    return key_serial (key_serial_numbers_[key]);
   else if (Object_key const *serialized = serialized_keys_[key])
-    {
-      return key_serial (key_serial_numbers_[ serialized_keys_ [serialized] ]);
-    }
+    return key_serial (key_serial_numbers_[ serialized_keys_ [serialized] ]);
 
   return serialize_key (key);
 }